aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [PATCH] size_t portability fixes - drivers/usbAl Viro2005-04-26
| | | | | | | size_t is zu, ssize_t is zd... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Automatic merge of kernel.org:/home/rmk/linux-2.6-serial.gitLinus Torvalds2005-04-26
|\
| * [PATCH] Serial: Convert 8250_hp300 to use serial8250_{un,}register_portRussell King2005-04-26
| | | | | | | | | | | | | | | | | | Convert 8250_hp300 to use serial8250_register_port() and serial8250_unregister_port(). Tested by Kars de Jong, 4/4/2005. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * [PATCH] Serial: Move error path processing inlineRussell King2005-04-26
| | | | | | | | | | | | | | With unlikely() there's no need for the error path to use gotos. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * [PATCH] Serial: Ensure error paths are marked with unlikely()Russell King2005-04-26
| | | | | | | | | | | | | | Ensure ARM serial driver error paths are marked with the unlikely() compiler hint. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
* | Automatic merge of kernel.org:/home/rmk/linux-2.6-rmk.gitLinus Torvalds2005-04-26
|\ \
| * | [PATCH] ARM: make entry*.S includes more logicalRussell King2005-04-26
| | | | | | | | | | | | | | | | | | | | | Move common includes to entry-header, and file specific includes to the relevant file. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * | [PATCH] ARM: Remove single-use user save/restore macrosRussell King2005-04-26
| | | | | | | | | | | | | | | | | | | | | Assembly macros are pointless if they're only used once. Move them inline. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * | [PATCH] ARM: remove PT_TRACESYSRussell King2005-04-26
| | | | | | | | | | | | | | | | | | PT_TRACESYS is unused, remove it. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * | [PATCH] ARM: Remove SVC_MODE definitionRussell King2005-04-26
| | | | | | | | | | | | | | | | | | | | | SVC_MODE reflects the MODE_SVC definition in asm/ptrace.h. Use the asm/ptrace.h definition instead, and remove SVC_MODE. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * | [PATCH] ARM: Use __NR_SYSCALL_BASE and __ARM_NR_BASE in asm codeRussell King2005-04-26
| | | | | | | | | | | | | | | | | | | | | Don't define our own local constants, but use those already defined in asm/unistd.h instead. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * | [PATCH] ARM: pt_regs offsetsRussell King2005-04-26
| | | | | | | | | | | | | | | | | | | | | Generate pt_regs S_xx offsets from the structure itself instead of #defining them. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * | [PATCH] ARM: Remove argument for disable_irq/enable_irqRussell King2005-04-26
| | | | | | | | | | | | | | | | | | | | | Since we do not require a register for these operations, we can remove this unnecessary argument. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * | [PATCH] ARM: remove some entry initialisation asm codeRussell King2005-04-26
| | | | | | | | | | | | | | | | | | Convert the trivial vector entry initialisation code to C code. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
* | | [PATCH] qla trivial iomem annotationAl Viro2005-04-26
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] oprofile trivial user annotationsAl Viro2005-04-26
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] amd64 rt_sigframe user annotationAl Viro2005-04-26
| | | | | | | | | | | | | | | | | | | | | | | | ->pretcode in struct rt_sigframe is a userland pointer (and already treated as such by code using that field). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] drivers/scsi NULL noise removalAl Viro2005-04-26
| | | | | | | | | | | | | | | | | | | | | NULL noise in sbus scsi drivers got missed Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] imsttfb missing iomem annotationsAl Viro2005-04-26
| | | | | | | | | | | | | | | | | | | | | write_reg_le32() and read_reg_le32() expect iomem pointers... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] ppc-opc NULL noise removalAl Viro2005-04-26
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] savagefb iomem annotationsAl Viro2005-04-26
| | | | | | | | | | | | | | | | | | | | | | | | trivial iomem annotations + memset() replaced with memset_io() in a place that deals with ioremapped area. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] pegasus NULL noise removalAl Viro2005-04-26
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] tpm 64bit fixes (size_t)Al Viro2005-04-26
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] fix SND_POWERMAC dependenciesAl Viro2005-04-26
| | | | | | | | | | | | | | | | | | | | | | | | This beast is pmac-only; moreover, it won't build on other subarchitectures. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Automatic merge of ↵Linus Torvalds2005-04-26
|\ \ \ | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
| * | | [PATCH] USB: Fix for ati_remotePatrick Boettcher2005-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when stealing code from ati_remote for a GPL-driver of my usbradio (because of its neat usb int transfers) I found out, that the inbuf is freed twice. I don't have the ati-remote, so I don't know it is a problem at all, but it looks strange to me anyway. Also I don't know if it has been fixed already in newer kernel versions. From: Patrick Boettcher <patrick.boettcher@desy.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: better usbnet zaurus/mdlm/... fixDavid Brownell2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a somewhat more comprehensive fix for the problem of devices like the newer Zaurii ... or in this case some Motorola cell phones. To recap, the problem's root cause is that these devices aren't using standard USB class specifications for their network links, and so far we've had to add lots of device-specific driver entries. The vendor fix abuses the CDC MDLM descriptors (they _could_ have conformed to the spec, but didn't) and defines a "Belcarra firmware" pseudo-class. This patch recognizes that pseudo-class by the GUIDs in those descriptors, and handles the devices that just use the Zaurus framing. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] usbnet: Convert ASIX code to use new status infrastructureDavid Hollis2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the ASIX USB Ethernet code to make use of the new status infrastructure in usbnet. Additionally, add a link_reset() handler to the struct usbnet structure to provide a generic means for a driver to perform link reset tasks such as a determining link speed and setting device flags accordingly. Signed-off-by: David Hollis <dhollis@davehollis.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: MODALIAS change for bcdDeviceRoman Kagan2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch below adjusts the MODALIAS generated by the usb hotplug function to match the proposed change to scripts/mod/file2alias.c. Signed-off-by: Roman Kagan <rkagan@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: scripts/mod/file2alias.c: handle numeric ranges for USB bcdDeviceRoman Kagan2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another attempt at that... The attached patch fixes the longstanding problem with USB bcdDevice numeric ranges incorrectly converted into patterns for MODULE_ALIAS generation. Previously it put both the lower and the upper limits into the pattern, dlXdhY, making it impossible to fnmatch against except for a few special cases, like dl*dh* or dlXdhX. The patch makes it generate multiple MODULE_ALIAS lines covering the whole range with fnmatch-able patterns. E.g. for a range between 0x0001 and 0x8345 it gives the following patterns: 000[1-9] 00[1-9]* 0[1-9]* [1-7]* 8[0-2]* 83[0-3]* 834[0-5] Since bcdDevice is 2 bytes wide = 4 digits in hex representation, the max no. of patters is 2 * 4 - 1 = 7. The values are BCD (binary-coded decimals) and not hex, so patterns using a dash seem to be safe regardless of locale collation order. The patch changes bcdDevice part of the alias from dlXdhY to dZ, but this shouldn't have big compatibility issues because fnmatch()-based modprobing hasn't yet been widely used. Besides, the most common (and almost the only working) case of dl*dh* becomes d* and thus continues to work. The patch is against 2.6.12-rc2, applies to -mm3 with an offset. The matching patch to fix the MODALIAS environment variable now generated by the usb hotplug function follows. Signed-off-by: Roman Kagan <rkagan@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: drivers/usb/net/zd1201.c: make some code staticAdrian Bunk2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: drivers/usb/media/pwc/: make code staticAdrian Bunk2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes needlessly global code static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: drivers/usb/media/sn9c102_core.c: make 2 functions staticAdrian Bunk2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: drivers/usb/input/usbkbd.c: make a function staticAdrian Bunk2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes a needlessly global function static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: new SiS device idThomas Winischhofer2005-04-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: fix up the HP49G+ Calculator USB Serial driverGreg KH2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warnings, and remove unneeded #includes Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: add HP49G+ Calculator USB Serial supportArthur Huillet2005-04-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: clean up all iPod models in unusual_devs.hSven Anderson2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Phil Dibowitz wrote: > 1. You're adding product IDs 1202, 1203, 1204, and 1205. 1203 was > already there, but you remove it, OK, but 1205 is already there, so > you'll need to fix that. I was not removing 1203, it's just the extension of the bcd range. You are right about 1205, as I wrote, it was a patch against 2.6.11.7. Attached is a patch against 2.6.12-rc2. > 2. I'm OK with the full bcd range if Apple is changing it on firmware > revs... fine, but it's bcd, not hex... 0x9999 =) I just copied from other entries. There're a lot 0xffffs in unusual_dev.h, so I assumed it is correct. I changed it to 0x9999. > 3. It's rather obnoxious to take the original submitter's credit away. I didn't remove it, I changed it to "based on...". Because I changed something (the range) in his entry, I thought it is the best to take the responsibility but keep the origin. Anyway, in the new patch I did it in a different way. > 4. Your /proc/bus/usb/devices shows 1204, but I see no evidence 1202 is > really an iPod. I don't have an old iPod mini, but you find a lot of evidence here: http://www.google.com/search?q=0x1202+ipod Especially this one: http://www.qbik.ch/usb/devices/showdescr.php?id=2737 > It also looks like 1205's entry is getting mangled, but I haven't > attempted to apply the patch, so I'm not sure. No, the patch was ok, but I agree it looks strange. It's not very readable, because I cannot tell diff to work blockwise instead of linewise. Because of the similarity of the entries, diff splits and merges them. Anyway, the new patch "looks" better. ;-) Signed-off-by: Sven Anderson <sven-linux@anderson.de> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [PATCH] USB: compilation failure on usb/image/microtek.cHideaki YOSHIFUJI2005-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maybe typo? Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | | Automatic merge of ↵Linus Torvalds2005-04-26
|\ \ \ \ | |_|_|/ |/| | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
| * | | [NET]: kill gratitious includes of major.hAl Viro2005-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of places in there are including major.h for no reason whatsoever. Removed. And yes, it still builds. The history of that stuff is often amusing. E.g. for net/core/sock.c the story looks so, as far as I've been able to reconstruct it: we used to need major.h in net/socket.c circa 1.1.early. In 1.1.13 that need had disappeared, along with register_chrdev(SOCKET_MAJOR, "socket", &net_fops) in sock_init(). Include had not. When 1.2 -> 1.3 reorg of net/* had moved a lot of stuff from net/socket.c to net/core/sock.c, this crap had followed... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TCP]: Trivial tcp_data_queue() cleanupJames Morris2005-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes a superfluous intialization from tcp_data_queue(). Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TG3]: Fix tg3_restart_ints()Michael Chan2005-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tg3_restart_ints() is called to re-enable interrupts after tg3_poll() has finished all the work. It calls tg3_cond_int() to force an interrupt if the status block updated bit is set. The updated bit will be set if there is a new status block update sometime during tg3_poll() and it can be very often. The worst part is that even if all the work has been processed, the updated bit remains set and an interrupt will be forced unnecessarily. The fix is to call tg3_has_work() instead to determine if new work is posted before forcing an interrupt. The way to force an interrupt is also changed to use "coalesce_now" instead of "SETINT". The former is generally a safer way to force the interrupt. Also deleted the first parameter to tg3_has_work() which is unused. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TG3]: Refresh hw index in tg3_rx()Michael Chan2005-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch refreshes the hw rx producer in tg3_rx() so that additional work posted by the hardware can be processed. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TG3]: Fix bug in tg3_rx()Michael Chan2005-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug that causes tg3_has_work() to always return 1. rx work is determined by comparing tp->rx_rcb_ptr with the current hw producer index. The hw producer index is modulo the ring size, but tp- >rx_rcb_ptr is a free running counter that goes up beyond the ring size. After the ring wraps around once, tg3_has_work() will always return 1. The fix is to always do modulo arithmetic on tp->rx_rcb_ptr. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [PKT_SCHED]: Eliminate unnecessary includes in simple.cDavid S. Miller2005-04-25
| | | | | | | | | | | | | | | | | | | | | | | | Noted by Al Viro. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: Drop conntrack reference when packet leaves IPPatrick McHardy2005-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the event a raw socket is created for sending purposes only, the creator never bothers to check the socket's receive queue. But we continue to add skbs to its queue until it fills up. Unfortunately, if ip_conntrack is loaded on the box, each skb we add to the queue potentially holds a reference to a conntrack. If the user attempts to unload ip_conntrack, we will spin around forever since the queued skbs are pinned. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: Fix truncated sequence numbers in FTP helperYasuyuki KOZAKAI2005-04-25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozkaai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | [PATCH] kill gratitious includes of major.h under net/*Al Viro2005-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of places in there are including major.h for no reason whatsoever. Removed. And yes, it still builds. The history of that stuff is often amusing. E.g. for net/core/sock.c the story looks so, as far as I've been able to reconstruct it: we used to need major.h in net/socket.c circa 1.1.early. In 1.1.13 that need had disappeared, along with register_chrdev(SOCKET_MAJOR, "socket", &net_fops) in sock_init(). Include had not. When 1.2 -> 1.3 reorg of net/* had moved a lot of stuff from net/socket.c to net/core/sock.c, this crap had followed... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | [PATCH] isofs includes sanitizedAl Viro2005-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fs/isofs includes trimmed down to something resembling sanity. Kernel-only parts of linux/iso_fs.h and entire linux/iso_fs_{sb,i}.h moved to fs/isofs/isofs.h. A lot of useless #include in fs/isofs/*.c killed. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>