summaryrefslogtreecommitdiff
path: root/include/linux
AgeCommit message (Collapse)Author
2004-12-21Merge intel.com:/home/lenb/src/26-latest-devLen Brown
into intel.com:/home/lenb/src/26-latest-hotplug
2004-12-16[PATCH] parenthesize init_wait() macro parametersAndrew Morton
Addresses bug #3863, from <daveh@dmh2000.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-12-16[PATCH] i2o: increase timeout for LCT_NOTIFYMarkus Lidel
Some users have reported problems with the I2O subsystem, which was caused by the timeout to fetch the LCT. - increases the timeout for I2O LCT_GET. On some systems the time to get a reply from the I2O controller is longer then the timeout to wait. Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-12-13Merge nuts.davemloft.net:/disk1/BK/network-2.6David S. Miller
into nuts.davemloft.net:/disk1/BK/net-2.6
2004-12-12[PATCH] dvb: av7110 driver updateMichael Hunold
- av7110: fixed av7110_before_after_tune()/av7110_fe_lock_fix(): firmware >= 261d: wait for empty message queue, firmware <= 261c: wait 50ms - av7110: add __user and __iomem annotations, remove some unnecessary cast (patch by C.Y.M) - av7110: __av7110_send_fw_cmd(): added some sanity checks suggested by Werner Fin - av7110: added support for full-featured DVB-C cards: 13c2:0000 Siemens DVB-C (full-length card) VES1820/Philips CD1516 and 13c2:0003 Haupauge DVB-C 2.1 VES1820/ALPS TDBE2 - av7110: follow saa7146 changes, remove superflous casts, and other misc. minor cleanups - av7110: Fixed race condition between driver and av7110 while accessing the COMMAND register in DPRAM. See http://www.linuxtv.org/mailinglists/vdr/2004/01-2004/msg00331.html - budget: various cleanups by Adrian bunk Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-12-12[PATCH] Add missing __KERNEL__ (or other) protectionsTom Rini
As of 2.6.10-rc3, the following is needed to allow various userland packages (sysvinit, dhcp, ppp, libcap, libpcap, lilo) to compile as parts that userland needs (e.g. for ioctls) is in files with stuff userland isn't allowed to see. This adds __KERNEL__ around <linux/ata.h> and some defines (<linux/ata.h> isn't needed by userland, and is unhappy right now). sysvinit and some other packages need <linux/hdreg.h> for HDIO_DRIVE_CMD and other IOCTL things. In <linux/types.h> we were unsafely typedef'ing __le64/__be64 as __u64 only exists when __GNUC__ && !__STRICT_ANSI__ (causing libcap to fail, for example). Finally, <asm/atomic.h> provides routines userland simply cannot use on all arches, but <linux/filter.h> is needed by iputils for example. While not all arches put __KERNEL__ around their header, on MIPS including this header currently blows up the build. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-12-10[ide] alim15x3: add support for ULi M5228Bartlomiej Zolnierkiewicz
From: Clear Zhang <Clear.Zhang@uli.com.tw> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2004-12-10[ide] atiixp: add new PCI identifierBartlomiej Zolnierkiewicz
From: Pascal Lengard <lklm@lengard.net> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2004-12-09[NETFILTER]: TCP window tracking bug fixes.Jozsef Kadlecsik
1) Name IP_CT_TCP_STATE_FLAG_WINDOW_SCALE more consistently. 2) Client sends SYN, server responds with SYN/ACK. However the SYN/ACK is lost in transit and the client keeps sending the SYNs. The server times out, restarts, and sends SYN/ACK with new sequence numbers. Those packets were however erroneously dropped by the window tracking code. 3) NFS client and server, client crashes and connects to the server from the same port as before the crash. Server thinks the connection is still alove and sends an ACK, client responds with a RST and tears down the connection so that it can start a new one. That was not handled by the previous code. 4) Occasionally the window tracking code logged BUG lines due to a leftover ack instead of sack in the logging part. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2004-12-08[PATCH] USB: sl811-hcd driver, replaces hc_sl811David Brownell
This patch provides a new "sl811-hcd" driver, which should replace the older one from Cypress (which has been broken for ages, even on SA-1100). Key features of this new driver: - Small, relatively tight code; - Uses the 2.6 platform_device and usbcore HCD infrastructures; - Compiles (x86, ARM) and works (ARM/PXA255); - Passed a day's worth of "usbtest" stress testing (on 2.6.9). I've enumerated over a dozen different devices with it, and actually tested mice, hubs, keyboards, and usb-storage. There's a hardware erratum that prevents this chip from working with certain external hubs. There's scope yet for some performance work here; and some IRQ quirks linger. This PIO-only driver should serve as a model for some other non-DMA USB host controllers (like isp1161, isp1362, td243) used in embedded Linuxes ... in particular, showing how to maintain async and periodic schedules without pointless emulation of OHCI DMA queues and/or registers. The driver should handle ISO, but since it doesn't implement the special urb->iso_frame_desc[] "pseudo-queue" model (and since Linux can't guarantee low enough IRQ latencies!), ISO is disabled. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2004-12-07[NET]: Fix CMSG validation checks wrt. signedness.Herbert Xu
Noticed by Georgi Guninski. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2004-12-07Merge bk://gkernel.bkbits.net/libata-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-12-07[libata] only DMA map data for DMA commands (fix >=4GB bug)Jeff Garzik
libata made the assumption that (for PIO commands in this case) it could modify DMA memory at the kernel-virtual address, after mapping this. This is incorrect, and fails on e.g. platforms that copy DMA memory back and forth (swiotlb on Intel EM64T and IA64). Remove this assumption by ensuring that we only call the DMA mapping routines if we really are going to use DMA for data xfer. Also: remove a bogus WARN_ON() in ata_sg_init_one() which caused bug reports (but no problems).
2004-12-07[PATCH] dvb: core changesMichael Hunold
- [DVB] dvb-core: follow Linux coding style, kill dvb_ksyms.c and move the EXPORT_SYMBOLs to the files where the functions are, thanks to Adrian Bunk <bunk@stusta.de> - [DVB] dvb-core: #if 0'ing unused code, make needlessly global code static, whitespace and newline cleanups, thanks to Adrian Bunk <bunk@stusta.de> - [DVB] dvb_ca_en50221.c: support for KNC1/Cinergy CI modules, fix segfaults, enhanced poll_slot_status to support non-IRQ interfaces, Fix module usage count problem - [DVB] dvb-frontend.c: core changes to support the refactorized frontend drivers Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-12-06mergeLen Brown
2004-12-04Merge bk://bk.arm.linux.org.uk/linux-2.6-serialLinus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-12-04[SERIAL] Ensure correct units for close_delay and closing_wait.Russell King
Use milliseconds internally for these delays, and convert them to centiseconds at the interface boundary to the ioctl configuration controls.
2004-12-02[PATCH] proc_pid_status() oops fixManfred Spraul
proc_pid_status dereferences pointers in the task structure even if the task is already dead. This is probably the reason for the oops described in http://bugme.osdl.org/show_bug.cgi?id=3812 The attached patch removes the pointer dereferences by using pid_alive() for testing that the task structure contents is still valid before dereferencing them. The task structure itself is guaranteed to be valid - we hold a reference count. Signed-Off-By: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-12-01Merge intel.com:/home/lenb/src/26-stable-devLen Brown
into intel.com:/home/lenb/src/26-latest-dev
2004-12-01[ACPI] update C-state limiting patchLen Brown
Now "max_cstate=" instead of "acpi_cstate_limit=" Delete redundant static cstate flags .c2 and .c3 http://bugme.osdl.org/show_bug.cgi?id=3549 For static processor driver, boot cmdline: processor.max_cstate=2 For processor module, /etc/modprobe.conf: options processor max_cstate=2 or # modprobe processor max_cstate=2 From kernel or kernel module: #include <linux/acpi.h> acpi_set_cstate_limit(2); Suggested-by: Pavel Machek Signed-off-by: Len Brown <len.brown@intel.com>
2004-11-30Merge bk://kernel.bkbits.net/davem/net-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-11-30[GNET_STATS]: kernel-api doc for gnet stats/estimatorThomas Graf
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
2004-11-30Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-11-30mergeLen Brown
2004-11-29Merge kroah.com:/home/greg/linux/BK/bleed-2.6Greg Kroah-Hartman
into kroah.com:/home/greg/linux/BK/i2c-2.6
2004-11-29Merge kroah.com:/home/greg/linux/BK/bleed-2.6Greg Kroah-Hartman
into kroah.com:/home/greg/linux/BK/usb-2.6
2004-11-29USB: move a internal usbfs only structure out of a public header file.Greg Kroah-Hartman
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2004-11-29[SERIAL] Add missing definition for PORT_IMX.Russell King
2004-11-28[PATCH] I2C: Add support for the nForce2 Ultra 400 to i2c-nforce2Jean Delvare
This simple patch adds support for the nForce2 Ultra 400 to i2c-nforce2. I just made a similar update on the 2.4/CVS version of the driver. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2004-11-25Merge bk://kernel.bkbits.net/davem/net-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-11-25[PATCH] ia64/x86_64/s390 overlapping vma fixZou Nanhai
IA64 is also vulnerable to the huge-vma-in-executable bug in 64 bit elf support, it just insert a vma of zero page without checking overlap, so user can construct a elf with section begin from 0x0 to trigger this BUGON(). However, I think it's safe to check overlap before we actually insert a vma into vma list. And I also feel check vma overlap everywhere is unnecessary, because invert_vm_struct will check it again, so the check is duplicated. It's better to have invert_vm_struct return a value then let caller check if it successes. Here is a patch against 2.6.10.rc2-mm3 I have tested it on i386, x86_64 and ia64 machines. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Zou Nan hai <Nanhai.zou@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-24[PATCH] dont deprecate MODULE_PARMAndrew Morton
Let's revert this for now so all those warnings do not soil our 2.6.10 release. We'll get Rusty's kernel-wide-sweep fixup patches in for 2.6.11, and then we can put this warning back. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-23[DIO]: Fix typo in dio_resource_len()Geert Uytterhoeven
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2004-11-21[PATCH] mc146818rtc.h include fixMichael Obster
Prevents user-space including spinlock.h which breaks the build. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-21[PATCH] serial: add support for Dell Remote Access Card 4.Tim T. Murphy
Here's a patch to include Dell's 4th generation Remote Access Controller ids. Acked-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-21[PATCH] fbdev: Add NV30 pci_id and cleanup of probe error returnsAntonino Daplas
From Guido Guenther <agx@sigxcpu.org> this patch against 2.6.10-rc2 finally detects rivafb on NV30 based power books by adding the pciid. Wolfram Quester tested it and reported it working. It also cleans up the error code reported from the probe function. From Antonino Daplas <adaplas@pol.net> - do not validate mode if monitor specifications are not available Signed-Off-By: Guido Guenther <agx@sigxcpu.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-20[PATCH] i2o iomem annotationsAlexander Viro
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-18[PATCH] linux/mount.h: add atomic.h and spinlock.h #includesRoland Dreier
<linux/mount.h> uses atomic_t and spinlock_t, but doesn't include either <asm/atomic.h> or <linux/spinlock.h>, which means that any users of <linux/mount.h> have to include them. This patch adds the necessary #includes to avoid this. Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-18[PATCH] sonypi: return an error from sonypi_camera_command() if the camera ↵Stelian Pop
isn't enabled The sonypi_camera_command() used to fail without returning an error code if the user fergot to enable the camera in the sonypi module (using the camera=1 module parameter). This caused the meye driver to apparently load correctly but miserably fail later, when trying to access the camera for getting some data out of it. This patch adds an error code to sonypi_camera_command() and makes the meye driver check for it in the PCI probe routine. If the function fails, a message is printed in the kernel logs reminding the user it should better RTFM. The patch also removes some sonypi_camera_command() commands (those supposed to return the current camera settings) which are unreliable. The meye driver does not use them anyway. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-18[PATCH] allow NFS exports of EFS filesystemsChristoph Hellwig
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-18[PATCH] vmscan: ignore swap token when in troubleAndrew Morton
The token-based thrashing control patches introduced a problem: when a task which doesn't hold the token tries to run direct-reclaim, that task is told that pages which belong to the token-holding mm are referenced, even though they are not. This means that it is possible for a huge number of a non-token-holding mm's pages to be scanned to no effect. Eventually, we give up and go and oom-kill something. So the patch arranges for the thrashing control logic to be defeated if the caller has reached the highest level of scanning priority. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-18[PATCH] move HCDP/PCDP to early uart consoleBjorn Helgaas
This changes the HCDP/PCDP support to use the early uart console rather than using early_serial_setup(). As a consequence, ia64 serial device names will now stay constant regardless of firmware console settings. (A serial device selected as an EFI console device on HP ia64 boxes used to automatically become ttyS0.) This also removes the ia64 early-boot kludge of assuming legacy COM ports at 0x3f8 and 0x2f8. For boxes that have legacy ports but no HCDP, "console=ttyS0" will still work, but the console won't start working until after the serial driver initializes and discovers the devices. WARNING: If you have an HP machine and you're using the MP serial console port (the connector labelled "console" on the 3-headed cable), this patch will break your console! HOW TO FIX IT: 1) The console device will change from /dev/ttyS0 to /dev/ttyS1, ttyS2, or ttyS3, so: 1a) Edit /etc/inittab to add a getty entry for /dev/ttyS1 (rx4640, rx5670, rx7620, rx8620, Superdome), /dev/ttyS2 (rx1600), or /dev/ttyS3 (rx2600). 1b) Edit /etc/securetty to add ttyS1, ttyS2, or ttyS3. 1c) Leave the existing ttyS0 entries in /etc/inittab and /etc/securetty so you can still boot old kernels. 2) Edit /etc/elilo.conf to remove any "console=" arguments (see [1]). 3) Run elilo to install the bootloader with new configuration. 4) Reboot and use the EFI boot option maintenance menu to select exactly one device for console output, input, and standard error. Then do a cold reset so the changes take effect. For the MP console, be careful to select the device with "Acpi(HWP0002,700)/Pci(...)/Uart" in the path (see [2]). DETAILS: - Prior to this patch, serial device names depended on the HCDP, which in turn depends on EFI console settings. After this patch, the naming always stays the same, regardless of firmware settings. For example, an rx1600 with a single built-in serial port plus an MP has these ports: Old Old MMIO (EFI console (EFI console address on builtin) on MP port) New ========== ========== ========== ====== builtin 0xff5e0000 ttyS0 ttyS1 ttyS0 MP UPS 0xf8031000 ttyS1 ttyS2 ttyS1 MP Console 0xf8030000 ttyS2 ttyS0 ttyS2 MP 2 0xf8030010 ttyS3 ttyS3 ttyS3 MP 3 0xf8030038 ttyS4 ttyS4 ttyS4 - If you want to have multiple devices in the EFI console path, you can, but Linux won't be able to deduce which console to use, so it will default to using VGA. You can use "console=hcdp" (the UART device from the EFI path) or "console=ttyS<n>" to select the device directly. TROUBLESHOOTING: - No kernel output after "Uncompressing Linux... done": -> You're using an MP port as the console and specified "console=ttyS0". This port is now named something else. Remove the "console=" option. -> Multiple UARTs selected as EFI console devices, and you're looking at the wrong one. Make sure only one UART is selected (use the EFI Boot Manager "Boot option maintenance" menu). -> You're physically connected to the MP port but have a non-MP UART selected as EFI console device. Either move the console cable to the non-MP UART, or change the EFI console path to the MP UART (the MP UART is the one with "Acpi(HWP0002,700)/Pci(...)/Uart" in it.) - Long pause (60+ seconds) between "Uncompressing Linux... done" and start of kernel output: -> No early console, probably because you used "console=ttyS<n>". Remove the "console=" option. - Kernel and init script output works fine, but no "login:" prompt: -> Add getty entry to /etc/inittab for console tty. Use the table in (1a) above or look for the "Adding console on ttyS<n>" message that tells you which device is the console. - "login:" prompt, but can't login as root: -> Add entry to /etc/securetty for console tty. [1] When the EFI console path contains exactly one device (either serial or VGA), 2.6.6 and newer kernels default to that device automatically. So if you remove "console=" arguments, you can use the same elilo configuration to boot any 2.6.6 or newer kernel with or without this patch. If you need to boot kernels older than 2.6.6 (including RHEL3 and SLES9), keep an 'append="console=ttyS0"' line in those elilo.conf stanzas. Non-HP machines will still need "console=" for serial consoles because they don't supply the HCDP table. [2] The HP management card (MP) causes confusion because it is always active as an EFI console, even if it doesn't appear in the EFI console path. If your console path is set to a non-MP UART, and you happen to be attached to the MP UART, everything works in EFI, but the kernel will think the non-MP UART is the console, so you won't see any kernel output. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-18[PATCH] early uart console supportBjorn Helgaas
This adds an early polled-mode "uart" console driver, based on Andi Kleen's early_printk work. The difference is that this locates the UART device directly by its MMIO or I/O port address, so we don't have to make assumptions about how ttyS devices will be named. After the normal serial driver starts, we try to locate the matching ttyS device and start a console there. Sample usage: console=uart,io,0x3f8 console=uart,mmio,0xff5e0000,115200n8 If the baud rate isn't specified, we peek at the UART to figure it out. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-18[PATCH] I2C: i2c-nforce2.c add support for nForce3 Pro 150 MCPThomas Leibold
This is the all new and improved version of the patch: - following the advise from Jean Delvare I removed the redundant definition of the PCI IDs from the driver and just add them to the pci_ids.h file. - the patch is now created against linux 2.6.10-RC2. Signed-off-by: Thomas Leibold <thomas@plx.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2004-11-16MTD: some cleanupsDavid Woodhouse
The patch below makes the following cleanups for code under drivers/mtd/ : - make some needlessly global code static Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2004-11-16JFFS2: jffs2_fs_i.h needs <asm/semaphore.h>David Woodhouse
... and should include it directly rather than hoping it's been done. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2004-11-16MTD: Fix detection of hardware partitions in Intel flash chipsDavid Woodhouse
Determine it from the CFI query data instead of hard-coding it. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2004-11-15[PATCH] i2o: remove unused code and make needlessly global code staticMarkus Lidel
- remove unused code - make needlessly global code static Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-15[PATCH] i2o: changed code with BUG() to BUG_ON()Markus Lidel
- changed code with BUG() to use BUG_ON() which could be optimized by some platforms (original from Milton Miller) Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-11-15[PATCH] device-mapper: Allow referencing by device numberAlasdair G. Kergon
Currently userspace code using the dm ioctls must refer to a mapped device by either its name or its uuid. But in some circumstances you know neither of those directly. This patch lets you reference devices by their major/minor numbers as an alternative. Signed-Off-By: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>