aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [PATCH] powerpc: oprofile cpu type names clash with other codeAndy Whitcroft2006-01-13
| | | | | | | | | | | | | | | | | | | | | | In 2.6.15-git6 a change was commited in the oprofile support in the powerpc architecture. It introduced the powerpc_oprofile_type which contains the define G4. This causes a name clash with the existing wacom usb tablet driver. CC [M] drivers/usb/input/wacom.o drivers/usb/input/wacom.c:98: error: conflicting types for `G4' include/asm/cputable.h:37: error: previous declaration of `G4' CC [M] drivers/usb/mon/mon_text.o make[3]: *** [drivers/usb/input/wacom.o] Error 1 make[2]: *** [drivers/usb/input] Error 2 The elements of an enum declared in global scope are effectivly global identifiers themselves. As such we need to ensure the names are unique. This patch updates the later oprofile support to use unique names. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Provide a suitable AT_PLATFORM valuePaul Mackerras2006-01-13
| | | | | | | | | | | | | | | | | | | | The glibc folks want to use AT_PLATFORM to select between possible alternative versions of shared libraries. This commit makes the kernel supply an AT_PLATFORM string that indicates what class of processor we are running on. Processors with the same set of user-level instructions and roughly the same instruction scheduling characteristics are given the same AT_PLATFORM value; for example, 821, 823 and 860 are all reported as "ppc823", and 7447, 7447A, 7448, 7450, 7451, 7455 are all called "ppc7450". The intention is that the AT_PLATFORM values match the values that gcc accepts for the -mcpu= option. For values which are numeric (e.g. -mcpu=750), "ppc" has been prepended. This also adds a PPC_FEATURE_BOOKE bit to the AT_HWCAP value and sets it for the 440 family and the Freescale 85xx family. Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge ../linux-2.6Paul Mackerras2006-01-13
|\
| * [PATCH] Increase AT_VECTOR_SIZEPaul Mackerras2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On PowerPC, we want to be able to provide an AT_PLATFORM aux table entry to userspace, so that glibc can choose optimized libraries for the processor we're running on. Unfortunately that would be the 21st aux table entry on powerpc, meaning that the aux table including the terminating null entry would overflow the mm->saved_auxv[] array, leading to userland programs segfaulting. This increases the size of the mm->saved_auxv array to be large enough to accommodate an AT_PLATFORM entry on powerpc. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] Fix oops in ufs_fill_super at mount timeEvgeniy2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | There's a lack of parenthesis in fs/ufs/utils.h, so instead of the 512th byte of buffer, the usb2 pointer will point to the nth structure of type ufs_super_block_second. This can cause a mount-time oops if you're unlucky (especially with DEBUG_PAGEALLOC, which is how Alexey Dobriyan saw this problem) Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru> Acked-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] powerpc: reformat atomic_add_unlessAnton Blanchard2006-01-13
| | | | | | | | | | | | | | It makes my eyes hurt. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: use lwsync in atomics, bitops, lock functionsAnton Blanchard2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eieio is only a store - store ordering. When used to order an unlock operation loads may leak out of the critical region. This is potentially buggy, one example is if a user wants to atomically read a couple of values. We can solve this with an lwsync which orders everything except store - load. I removed the (now unused) EIEIO_ON_SMP macros and the c versions isync_on_smp and eieio_on_smp now we dont use them. I also removed some old comments that were used to identify inline spinlocks in assembly, they dont make sense now our locks are out of line. Another interesting thing was that read_unlock was using an eieio even though the rest of the spinlock code had already been converted to use lwsync. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Remove lppaca structure from the PACADavid Gibson2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present the lppaca - the structure shared with the iSeries hypervisor and phyp - is contained within the PACA, our own low-level per-cpu structure. This doesn't have to be so, the patch below removes it, making a separate array of lppaca structures. This saves approximately 500*NR_CPUS bytes of image size and kernel memory, because we don't need aligning gap between the Linux and hypervisor portions of every PACA. On the other hand it means an extra level of dereference in many accesses to the lppaca. The patch also gets rid of several places where we assign the paca address to a local variable for no particular reason. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Cleanup LOADADDR etc. asm macrosDavid Gibson2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch consolidates the variety of macros used for loading 32 or 64-bit constants in assembler (LOADADDR, LOADBASE, SET_REG_TO_*). The idea is to make the set of macros consistent across 32 and 64 bit and to make it more obvious which is the appropriate one to use in a given situation. The new macros and their semantics are described in the comments in ppc_asm.h. In the process, we change several places that were unnecessarily using immediate loads on ppc64 to use the GOT/TOC. Likewise we cleanup a couple of places where we were clumsily subtracting PAGE_OFFSET with asm instructions to use assemble-time arithmetic or the toreal() macro instead. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Updated platforms that use gianfar to match driverKumar Gala2006-01-13
| | | | | | | | | | | | | | | | | | The gianfar driver changed how it required MDIO bus and phy id's to be passed to it. Also, it no longer passes the physical address of the MDIO bus. Instead we have a proper platform device. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc/boot: Better use of defaultimage-Tom Rini2006-01-13
| | | | | | | | | | | | | | | | | | The following reworks how defaultimage- is used. We default to zImage here and then override it on platforms that need something more (uImage in the future) or less (vmlinux on iSeries). Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Add support for changing properties from userspaceDave C Boutcher2006-01-13
| | | | | | | | | | | | | | | | | | Add support to reconfigure the device tree through the existing proc filesystem interface. Add "add_property", "remove_property", and "update_property" commands to the existing interface. Signed-off-by: Dave Boutcher <sleddog@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Add of_find_property functionDave C Boutcher2006-01-13
| | | | | | | | | | | | | | | | | | Add an of_find_property function that returns a struct property given a property name. Then change the get_property function to use that routine internally. Signed-off-by: Dave Boutcher <sleddog@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Add/remove/update properties in firmware device treeDave C Boutcher2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for updating and removing device tree properties. Since we hand out pointers to properties with gay abandon, we can't just free the property storage. Instead we move deleted, or the old copy of an updated property, to a "dead properties" list. Also note, its not feasable to kref device tree properties. we call get_property() all over the kernel in a wild variety of contexts. One consequence of this change is that we now take a read_lock(&devtree_lock) when doing get_property(). Signed-off-by: Dave Boutcher <sleddog@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Add/remove/update properties in /proc/device-treeDave C Boutcher2006-01-13
| | | | | | | | | | | | | | | | | | | | | | Add support to the proc_device_tree file for removing and updating properties. Remove just removes the proc file, update changes the data pointer within the proc file. The remainder of the device-tree changes occur elsewhere. Signed-off-by: Dave Boutcher <sleddog@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Add some more pSeries hypervisor call constantsDave C Boutcher2006-01-13
| | | | | | | | | | | | | | Adds a few more hypervisor call constants. Signed-off-by: Dave Boutcher <sleddog@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] Remove bzImage targetTom Rini2006-01-13
|/ | | | | | | | | | Since the documentation no longer tells people to 'make bzImage', and with the previous patch nothing more than 'make' is required to get the right bootable images (just like on i386 now), this removes the bzImage -> zImage target redirect on ARCH=powerpc Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge branch 'upstream-linus' of ↵Linus Torvalds2006-01-12
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * [PATCH] via-velocity: use NETIF_F_IP_CSUM (hardware only support IPv4)John W. Linville2006-01-12
| | | | | | | | | | | | | | | | | | | | | | At least some versions of the via-velocity hardware only support checksumming IPv4 frames in hardware. However, the driver is currently setting the NETIF_F_HW_CSUM flag, which indicates support for more than just IPv4. This results in errors when trying to use IPv6 over via-velocity hardware. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] fix wrong comments in ieee80211.hJohannes Berg2006-01-12
| | | | | | | | | | | | | | | | | | | | The comments in ieee80211.h claim that one doesn't need to set the len parameter of the stats struct. But if one doesn't, the management frames are read far over the memory they actually occupy causing badness. Signed-Off-By: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] bonding: UPDATED hash-table corruption in bond_alb.cJay Vosburgh2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe I see the race Michael refers to (tlb_choose_channel may set head, which tlb_init_slave clears), although I was not able to reproduce it. I have updated his patch for the current netdev-2.6.git tree and added a version update. His original comment follows: Our systems have been crashing during testing of PCI HotPlug support in the various networking components. We've faulted in the bonding driver due to a bug in bond_alb.c:tlb_clear_slave() In that routine, the last modification to the TLB hash table is made without protection of the lock, allowing a race that can lead tlb_choose_channel() to select an invalid table element. -J Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] wireless/atmel: add IWENCODEEXT, IWAUTH, and association event supportDan Williams2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows the Atmel driver to work correctly with wpa_supplicant and other programs that require some conformance with WEXT-18. It should not affect current behavior of the driver. The patch does four things: 1) Implements SIOCSIWENCODEEXT, SIOCGIWENCODEEXT, SIOCSIWAUTH, and SIOCGIWAUTH calls for unencrypted and WEP operation 2) Accepts zero-filled addresses for SIOCSIWAP, which are legal and should turn off any previous forced WAP address 3) Sends association and de-association events to userspace at most of the appropriate times 4) Fixes erroneous order of CIPHER_SUITE_WEP_* arguments in one location which are actually unused anyway Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] replace MODULE_PARM in tulip/uli526x.cEric Sesterhenn / snakebyte2006-01-12
| | | | | | | | | | | | | | Replace the MODULE_PARM usage in uli526x.c with module_param. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] gianfar: Use new PHY_ID_FMT macroKumar Gala2006-01-12
| | | | | | | | | | | | | | | | | | | | Make the driver produce the string used by phy_connect and have board specific code pass the integer mii bus id and phy device id for the specific controller instance. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] phy: Added a macro to represent the string format used to match a ↵Kumar Gala2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | phy device Add the PHY_ID_FMT macro to ensure that the format of the id string used by a driver to match to its specific phy is consistent between the mdio_bus and the driver. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] gianfar mii: Use proper resource for MII memory regionKumar Gala2006-01-12
| | | | | | | | | | | | | | | | | | | | | | We can now have the gianfar mii platform device have a proper resource for the IO memory region for its registers. Previously we passed this information that the platform_data structure because we couldn't handle overlapping memory regions for platform devices. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] gfar: fix compile errorKumar Gala2006-01-12
| | | | | | | | | | | | | | | | Missing include of <linux/in.h> to get definition of IPPROTO_UDP. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] CONFIG_AIRO needs CONFIG_CRYPTOdann frazier2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | airo.c currently has MICSUPPORT enabled, which requires CONFIG_CRYPTO. A user reported a build failure which is due to the lack of a Kconfig dependency. See http://bugs.debian.org/344205. This patch makes Kconfig enforce this dependency. Signed-off-by: dann frazier <dannf@debian.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] corruption during e100 MDI register accessODonnell, Michael2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have identified two related bugs in the e100 driver. Both bugs are related to manipulation of the MDI control register. The first problem is that the Ready bit is being ignored when writing to the Control register; we noticed this because the Linux bonding driver would occasionally come to the spurious conclusion that the link was down when querying Link State. It turned out that by failing to wait for a previous command to complete it was selecting what was essentially a random register in the MDI register set. When we added code that waits for the Ready bit (as shown in the patch file below) all such problems ceased. The second problem is that, although access to the MDI registers involves multiple steps which must not be intermixed, nothing was defending against two or more threads attempting simultaneous access. The most obvious situation where such interference could occur involves the watchdog versus ioctl paths, but there are probably others, so we recommend the locking shown in our patch file. Signed-off-by: Michael O'Donnell <Michael.ODonnell@stratus.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jgarzik@pobox.com> Cc: John Ronciak <john.ronciak@intel.com> Cc: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2006-01-12
|\ \
| * | [PATCH] pcmcia: runtime powermanagement interfaceDominik Brodowski2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | With the "power/state" sysfs interface being deprecated, make another one available which is compatible to what was discussed on the linux PM mailinglist. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: add new IDs for serial_cs.cDominik Brodowski2006-01-12
| | | | | | | | | | | | | | | | | | | | | Add IDs for Sierra Aircard 55 CDMA 1xrtt Modem -- a CIS update is required for this card. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | | Merge branch 'drm-forlinus' of ↵Linus Torvalds2006-01-12
|\ \ \ | |_|/ |/| | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| * | drm: fix issues with systems with no MTRRDave Airlie2006-01-12
| | | | | | | | | | | | | | | | | | | | | On systems with no MTRR we should still define the interface. Original bug from apkm. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: cleanup properly on drm module unloadDave Airlie2006-01-11
| | | | | | | | | | | | | | | | | | Cleanup multiple cards properly Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fixup drm bufs being just under the EOMDave Airlie2006-01-11
| | | | | | | | | | | | | | | | | | | | | If the mapping was just under the end of memory it would fail. Lets DRM start on my PCI card. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix radeon warnings on 64-bitDave Airlie2006-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> drivers/char/drm/radeon_state.c: In function `radeon_cp_dispatch_texture': drivers/char/drm/radeon_state.c:1653: warning: int format, different type arg (arg 3) drivers/char/drm/radeon_state.c:1661: warning: int format, different type arg (arg 3) drivers/char/drm/radeon_state.c:1689: warning: int format, different type arg (arg 3) sizeof() doesn't return an int. Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix warning on alphaDave Airlie2006-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> On alpha: drivers/char/drm/via_dmablit.h:44: error: field `direction' has incomplete type Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove is_pci flag completely...Dave Airlie2006-01-03
| | | | | | | | | | | | | | | | | | this snuck back in, in the last merge. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: merge in Linus mainlineDave Airlie2006-01-03
| |\ \
| * | | drm: major update from CVS for radeon and coreDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch pull in a lot of changes from CVS to the main core DRM, and updates the radeon driver to 1.21.0 that supports r300 texrect and radeon card type ioctl. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update drm pci ids listDave Airlie2006-01-02
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: drm_ioctl.c sync with fixes from CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | Apply the fixes from CVS that were outstanding for this file Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update lock flags from userspaceDave Airlie2006-01-02
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update to i915 1.3.0Dave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for vblank ioctls to i915 driver From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update drm_memory_debug.hDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update from DRM CVS for drm memory debug From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: proper fix for drm_contextDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | Bad patch in last version Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: fix issue with contexts running out of RAMDave Airlie2006-01-02
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update PCIGART support from CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to work on FreeBSD the gart needed to use a local mapping This patch moves the mainline to the new code and aligns some comment changes From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove old reclaim_buffers from ix0 driversDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>