AgeCommit message (Collapse)AuthorLines
2007-01-31Revert "[PATCH] mm: micro optimise zone_watermark_ok"Linus Torvalds-2/+1
This reverts commit e80ee884ae0e3794ef2b65a18a767d502ad712ee. Pawel Sikora had a boot-time oops due to it - because the sign change invalidates the following comparisons, since 'free_pages' can be negative. The micro-optimization just isn't worth it. Bisected-by: Pawel Sikora <> Acked-by: Andrew Morton <> Cc: Nick Piggin <> Signed-off-by: Linus Torvalds <>
2007-01-31netxen patchesAl Viro-212/+196
Have fun. >From 24f4a1a77431575a9cdfaae25adda85842099f70 Mon Sep 17 00:00:00 2001 From: Al Viro <> Date: Mon, 1 Jan 2007 15:22:56 -0500 Subject: [PATCH] netxen trivial annotations Signed-off-by: Al Viro <> Signed-off-by: Jeff Garzik <>
2007-01-30[NETFILTER]: xt_hashlimit: fix ip6tables dependencyPatrick McHardy-1/+1
IP6_NF_IPTABLES=m, CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y results in a linker error since ipv6_find_hdr is defined in ip6_tables.c. Fix similar to Adrian Bunk's H.323 conntrack patch: selecting ip6_tables to be build as module requires hashlimit to be built as module as well. Signed-off-by: Patrick McHardy <> Signed-off-by: David S. Miller <>
2007-01-30Linux 2.6.20-rc7v2.6.20-rc7Linus Torvalds-1/+1
Ok, so I said there wouldn't be another -rc. I lied. Signed-off-by: Linus Torvalds <>
2007-01-30Merge branch 'for-linus' of ↵Linus Torvalds-16/+11 * 'for-linus' of HID: fix pb_fnmode and move it to generic HID HID: fix hid-input mapping for Firefly Mini Remote Control USB HID: fix hid_blacklist clash for 0x08ca/0x0010 HID: fix memleaking of collection
2007-01-30[PATCH] IPMI: fix timeout list handlingDavid Barksdale-2/+1
Fix a dangling pointer bug in ipmi_timeout_handler. A list of timedout messages is not re-initialized before reuse, causing the head of the list to point to freed memory. Signed-off-by: David Barksdale <> Signed-off-by: Corey Minyard <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] ntfs: kmap_atomic() atomicity fixAndrew Morton-0/+4
The KM_BIO_SRC_IRQ kmap slot requires local irq protection. Acked-by: Anton Altaparmakov <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] uml: fix signal frame alignmentJeff Dike-3/+5
Use the same signal frame alignment calculations as the underlying architecture. x86_64 appeared to do this, but the "- 8" was really subtracting 8 * sizeof(struct rt_sigframe) rather than 8 bytes. UML/i386 might have been OK, but I changed the calculation to match i386 just to be sure. Signed-off-by: Jeff Dike <> Cc: <> Cc: Adrian Bunk <> Cc: Paolo 'Blaisorblade' Giarrusso <> Acked-by: Antoine Martin <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] jmicron: 40/80pin primary
jmicron module detects all JMB36x as JMB361 and PATA0 has wrong pin status of XICBLID. Cc: Jeff Garzik <> Cc: Alan Cox <> Cc: Bartlomiej Zolnierkiewicz <> Cc: Sergei Shtylyov <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] Fix VIA quirksJean Delvare-36/+42
Fix VIA quirks that were recently broken by Alan Cox in the upstream kernel (commit 1597cacbe39802d86656d1f2e6329895bd2ef531). My understanding is that pci_find_present() doesn't work yet at the time the quirks are run. So I used a two-step quirk as is done for some other quirks already. First we detect the VIA south bridges and set the right low and high device limits, then we are ready to actually run the quirks on the affected devices. Signed-off-by: Jean Delvare <> Acked-by: Alan Cox <> Acked-by: Nick Piggin <> Cc: Greg KH <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] kprobes: replace magic numbers with enumMasami Hiramatsu-7/+13
Replace the magic numbers with an enum, and gets rid of a warning on the specific architectures (ex. powerpc) on which the compiler considers 'char' as 'unsigned char'. Signed-off-by: Masami Hiramatsu <> Cc: Prasanna S Panchamukhi <> Cc: Ananth N Mavinakayanahalli <> Cc: Anil S Keshavamurthy <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] Remove warning: VFS is out of sync with lock managerNeil Brown-2/+3
But keep it as a dprintk The message can be generated in a quite normal situation: If a 'lock' request is interrupted, then the lock client needs to record that the server has the lock, incase it does. When we come the unlock, the server might say it doesn't, even though we think it does (or might) and this generates the message. Signed-off-by: Neil Brown <> Acked-by: Trond Myklebust <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] translate dashes in filenames for headers installMike Frysinger-1/+1
The current filename->define translation does not scrub dashes so when creating stub defines for like asm-x86_64/ptrace-abi.h, we get: #define __ASM_STUB_PTRACE-ABI_H gcc just hates that sort of thing :) trivial attached patch adds - to the tr list to scrub it to _ Signed-off-by: Mike Frysinger <> Cc: David Woodhouse <> Cc: Sam Ravnborg <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] Don't allow the stack to grow into hugetlb reserved regionsAdam Litke-0/+7
When expanding the stack, we don't currently check if the VMA will cross into an area of the address space that is reserved for hugetlb pages. Subsequent faults on the expanded portion of such a VMA will confuse the low-level MMU code, resulting in an OOPS. Check for this. Signed-off-by: Adam Litke <> Cc: David Gibson <> Cc: William Lee Irwin III <> Cc: Hugh Dickins <> Cc: <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[SCTP]: Force update of the rto when processing HB-ACKVlad Yasevich-0/+6
When processing a HEARTBEAT-ACK it's possible that the transport rto timers will not be updated because a prior T3-RTX processing would have cleared the rto_pending flag on the transport. However, if we received a valid HEARTBEAT-ACK, we want to force update the rto variables, so re-set the rto_pending flag before calling sctp_transport_update_rto(). Signed-off-by: Vlad Yasevich <> Signed-off-by: Sridhar Samudrala <> Signed-off-by: David S. Miller <>
2007-01-30[IPV6]: fix BUG of ndisc_send_redirect()Li Yewang-0/+7
When I tested IPv6 redirect function about kernel, and found that the kernel can send redirect packets whose target address is global address, and the target is not the actual endpoint of communication. But the criteria conform to RFC2461, the target address defines as following: Target Address An IP address that is a better first hop to use for he ICMP Destination Address. When the target is the actual endpoint of communication, i.e., the destination is a neighbor, the Target Address field MUST contain the same value as the ICMP Destination Address field. Otherwise the target is a better first-hop router and the Target Address MUST be the router's link-local address so that hosts can uniquely identify routers. According to this definition, when a router redirect to a host, the target address either the better first-hop router's link-local address or the same as the ICMP destination address field. But the function of ndisc_send_redirect() in net/ipv6/ndisc.c, does not check the target address correctly. There is another definition about receive Redirect message in RFC2461: 8.1. Validation of Redirect Messages A host MUST silently discard any received Redirect message that does not satisfy all of the following validity checks: ...... - The ICMP Target Address is either a link-local address (when redirected to a router) or the same as the ICMP Destination Address (when redirected to the on-link destination). ...... And the receive redirect function of ndisc_redirect_rcv() implemented this definition, checks the target address correctly. if (ipv6_addr_equal(dest, target)) { on_link = 1; } else if (!(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) { ND_PRINTK2(KERN_WARNING "ICMPv6 Redirect: target address is not link-local.\n"); return; } So, I think the send redirect function must check the target address also. Signed-off-by: Li Yewang <> Acked-by: YOSHIFUJI Hideaki <> Signed-off-by: David S. Miller <>
2007-01-30[IPV6]: Fix up some CONFIG typosNeil Horman-2/+2
Signed-off-by: Neil Horman <> Signed-off-by: David S. Miller <>
2007-01-30[NETFILTER]: SIP conntrack: fix out of bounds memory accessPatrick McHardy-2/+2
When checking for an @-sign in skp_epaddr_len, make sure not to run over the packet boundaries. Signed-off-by: Patrick McHardy <> Signed-off-by: David S. Miller <>
2007-01-30[NETFILTER]: SIP conntrack: fix skipping over user info in SIP headersLars Immisch-2/+14
When trying to skip over the username in the Contact header, stop at the end of the line if no @ is found to avoid mangling following headers. We don't need to worry about continuation lines because we search inside a SIP URI. Fixes Netfilter Bugzilla #532. Signed-off-by: Lars Immisch <> Signed-off-by: Patrick McHardy <> Signed-off-by: David S. Miller <>
2007-01-30[NETFILTER]: xt_connbytes: fix division by zeroPatrick McHardy-17/+12
When the packet counter of a connection is zero a division by zero occurs in div64_64(). Fix that by using zero as average value, which is correct as long as the packet counter didn't overflow, at which point we have lost anyway. Additionally we're probably going to go back to 64 bit counters in 2.6.21. Based on patch from Jonas Berlin <>, with suggestions from KOVACS Krisztian <>. Signed-off-by: Patrick McHardy <> Signed-off-by: David S. Miller <>
2007-01-30[MAINTAINERS]: netfilter@ is subscribers-onlyRandy Dunlap-1/+1
netfilter mailing list is subscribers-only. Signed-off-by: Randy Dunlap <> Signed-off-by: David S. Miller <>
2007-01-30Revert "net: ifb error path loop fix"Linus Torvalds-1/+2
This reverts commit 0c0b3ae68ec93b1db5c637d294647d1cca0df763. Quoth David: "Jeff, please revert It's wrong. We had a lengthy analysis of this piece of code several months ago, and it is correct. Consider, if we run the loop and we get an error the following happens: 1) attempt of ifb_init_one(i) fails, therefore we should not try to "ifb_free_one()" on "i" since it failed 2) the loop iteration first increments "i", then it check for error Therefore we must decrement "i" twice before the first free during the cleanup. One to "undo" the for() loop increment, and one to "skip" the ifb_init_one() case which failed." Reported-by: David Miller <> Acked-by: Jeff Garzik <> Cc: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] namespaces: fix task exit disasterSerge E. Hallyn-3/+3
This is based on a patch by Eric W. Biederman, who pointed out that pid namespaces are still fake, and we only have one ever active. So for the time being, we can modify any code which could access tsk->nsproxy->pid_ns during task exit to just use &init_pid_ns instead, and move the exit_task_namespaces call in do_exit() back above exit_notify(), so that an exiting nfs server has a valid tsk->sighand to work with. Long term, pulling pid_ns out of nsproxy might be the cleanest solution. Signed-off-by: Eric W. Biederman <> [ Eric's patch fixed to take care of free_pid() too ] Signed-off-by: Serge E. Hallyn <> Signed-off-by: Linus Torvalds <>
2007-01-30Revert "[PATCH] namespaces: fix exit race by splitting exit"Linus Torvalds-40/+16
This reverts commit 7a238fcba0629b6f2edbcd37458bae56fcf36be5 in preparation for a better and simpler fix proposed by Eric Biederman (and fixed up by Serge Hallyn) Acked-by: Serge E. Hallyn <> Signed-off-by: Linus Torvalds <>
2007-01-30Merge branch 'upstream-linus' of ↵Linus Torvalds-15/+53 * 'upstream-linus' of libata: fix translation for START STOP UNIT libata-scsi: ata_task_ioctl should return ATA registers from sense data pata_platform: set_mode fix ata_if_xfermask() word 51 fix pata_sil680: PIO1 taskfile transfers overclocking fix (repost) libata: fix ata_eh_suspend() return value ahci: port_no should be used when clearing IRQ in ahci_thaw() Fix trivial conflict in drivers/ata/pata_platform.c manually
2007-01-30Merge Torvalds-13/+13
* [CPUFREQ] Remove unneeded errata workaround from p4-clockmod. [CPUFREQ] check sysfs_create_link return value
2007-01-30Merge Torvalds-22/+54
* [AGPGART] Add new IDs to VIA AGP. [AGPGART] Remove pointless assignment. [AGPGART] Remove pointless typedef in ati-agp [AGPGART] Prevent (unlikely) memory leak in amd_create_gatt_pages() [AGPGART] intel_agp: restore graphics device's pci space early in resume
2007-01-30Merge Torvalds-90/+71
* via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S ide: unregister idepnp driver on unload ide: add missing __init tags to IDE PCI host drivers ia64: add pci_get_legacy_ide_irq() ide/generic: Jmicron has its own drivers now atiixp.c: add cable detection support for ATI IDE atiixp.c: sb600 ide only has one channel atiixp.c: remove unused code jmicron: fix warning ide: update MAINTAINERS entry
2007-01-30Merge branch 'upstream-linus' of ↵Linus Torvalds-40/+83 * 'upstream-linus' of Broadcom 4400 resume small fix b44: src_desc->addr is little-endian e100: fix irq leak on suspend/resume bonding: ARP monitoring broken on x86_64 ehea: Fixed missing tasklet_kill() call ehea: Fixed wrong jumbo frames status query 82596 warning fixes FS_ENET: OF-related fixup for FEC and SCC MAC's net: ifb error path loop fix b44: Fix frequent link changes
2007-01-30[PATCH] fix indentation-related breakage in Kconfig.i386Al Viro-8/+8
Kconfig recognizes the end of help text by receding indentation depth. Recent patch had broken HOST_VMSPLIT_... choice in arch/um/Kconfig.i386 - all alternatives are interpreted as part of help text now. Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] b44: src_desc->addr is little-endianAl Viro-1/+1
Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] dma-mapping.h stubs fixAl Viro-9/+9
do { } while(0) is not a good imitation of function returning void; use ((void)0) instead. Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] missing dma_sync_single_range_for{cpu,device} on alphaAl Viro-6/+8
no-op as all dma_sync_... there. Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] pata_platform: fallout from set_mode() changeAl Viro-1/+2
Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] sym53c500_cs: remove bogus call fo free_dma()Al Viro-2/+0
What DMA for 16bit pcmcia card, anyway? We never do request_dma() there and ->dma_channel never changes since initialization to -1. IOW, that call is dead code. Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] mtd/nand/cafe.c missing include of dma-mapping.hAl Viro-0/+1
Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] missing exports of pm_power_off() on alpha and sparc32Al Viro-0/+2
Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-01-30Merge branch 'upstream' of git:// Torvalds-6/+7
* 'upstream' of git:// [MIPS] Fix typo of "CONFIG_MT_SMP". [MIPS] Ocelot G: Fix a few misspellings of CONFIG_GALILEO_GT64240_ETH [PATCH] Malta: Fix build if CONFIG_MTD is diabled.
2007-01-30Merge Torvalds-16/+28
* [PATCH] ALSA: Fix sysfs breakage
2007-01-30[PATCH] mm: mremap correct rmap accountingHugh Dickins-13/+2
Nick Piggin points out that page accounting on MIPS multiple ZERO_PAGEs is not maintained by its move_pte, and could lead to freeing a ZERO_PAGE. Instead of complicating that move_pte, just forget the minor optimization when mremapping, and change the one thing which needed it for correctness - filemap_xip use ZERO_PAGE(0) throughout instead of according to address. [ "There is no block device driver one could use for XIP on mips platforms" - Carsten Otte ] Signed-off-by: Hugh Dickins <> Cc: Nick Piggin <> Cc: Andrew Morton <> Cc: Ralf Baechle <> Cc: Carsten Otte <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] i386: In assign_irq_vector look at all vectors before giving upEric W. Biederman-13/+19
When the world was a simple and static place setting up irqs was easy. It sufficed to allocate a linux irq number and a find a free cpu vector we could receive that linux irq on. In those days it was a safe assumption that any allocated vector was actually in use so after one global pass through all of the vectors we would have none left. These days things are much more dynamic with interrupt controllers (in the form of MSI or MSI-X) appearing on plug in cards and linux irqs appearing and disappearing. As these irqs come and go vectors are allocated and freed, invalidating the ancient assumption that all allocated vectors stayed in use forever. So this patch modifies the vector allocator to walk through every possible vector before giving up, and to check to see if a vector is in use before assigning it. With these changes we stop leaking freed vectors and it becomes possible to allocate and free irq vectors all day long. This changed was modeled after the vector allocator on x86_64 where this limitation has already been removed. In essence we don't update the static variables that hold the position of the last vector we allocated until have successfully allocated another vector. This allows us to detect if we have completed one complete scan through all of the possible vectors. Acked-by: Auke Kok <> Signed-off-by: Eric W. Biederman <> Signed-off-by: Linus Torvalds <>
2007-01-30Merge branch 'for-linus' of Torvalds-96/+187
* 'for-linus' of [ARM] 4117/1: S3C2412: Fix writel() usage in selection code [ARM] 4111/1: Allow VFP to work with thread migration on SMP [ARM] 4112/1: Only ioremap to supersections if DOMAIN_IO is zero [ARM] 4106/1: S3C2410: typo fixes in register definitions [ARM] 4102/1: Allow for PHYS_OFFSET on any valid 2MiB address [ARM] Fix AMBA serial drivers for non-first serial ports [ARM] 4100/1: iop3xx: fix cpu mask for iop333 [ARM] Update mach-types [ARM] Fix show_mem() for discontigmem [ARM] 4096/1: S3C24XX: change return code form s3c2410_gpio_getcfg() [ARM] 4095/1: S3C24XX: Fix GPIO set for Bank A [ARM] 4092/1: i.MX/MX1 CPU Frequency scaling latency definition [ARM] 4089/1: AT91: GPIO wake IRQ cleanup [ARM] 4088/1: AT91: Unbalanced IRQ in serial driver suspend/resume [ARM] 4087/1: AT91: CPU reset for SAM9x processors [ARM] 4086/1: AT91: Whitespace cleanup [ARM] 4085/1: AT91: Header fixes. [ARM] 4084/1: Remove CONFIG_DEBUG_WAITQ
2007-01-30[PATCH] `make help' in build tree doesn't show headers_* targetsGeert Uytterhoeven-3/+3
`make help' in the build tree doesn't show the help texts about the `headers_install' and `headers_check' targets because it looks for include/asm-$(ARCH)/Kbuild in the wrong place. Add the missing `$(srctree)' prefixes to fix this. Also move the printing of the default install path for the headers inside the `if/fi', where it belongs. Signed-off-by: Geert Uytterhoeven <> Acked-by: Oleg Verych <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] cdev.h: forward declarationsJan Engelhardt-0/+4
Apparently this broke due to missing `struct inode' declaration. Signed-off-by: Jan Engelhardt <> Cc: Noah Watkins <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] ufs: reallocation fixEvgeniy Dushistov-15/+26
In blocks reallocation function sometimes does not update some of buffer_head::b_blocknr, which may and cause data damage. Signed-off-by: Evgeniy Dushistov <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] ufs: truncate negative to unsigned fixEvgeniy Dushistov-2/+2
During ufs_trunc_direct which is subroutine of ufs::truncate, we try the first of all free parts of block and then whole blocks. But we calculate size of block's part to free in the wrong way. This may cause bad update of used blocks and fragments statistic, and you can got report that you have free 32T on 1Gb partition. Signed-off-by: Evgeniy Dushistov <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] ufs: alloc metadata null page fixEvgeniy Dushistov-6/+13
These series of patches result of UFS1 write support stress testing, like running fsx-linux, untar and build linux kernel etc We pass from ufs::get_block_t to levels below: pointer to the current page, to make possible things like reallocation of blocks on the fly, and we also uses this pointer for indication, what actually we allocate data block or meta data block, but currently we make decision about what we allocate on the wrong level, this may and cause oops if we allocate blocks in some special order. Signed-off-by: Evgeniy Dushistov <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] fuse: fix bug in control filesystem mountMiklos Szeredi-0/+4
The BUG in fuse_ctl_add_dentry() could be triggered if the control filesystem was unmounted and mounted again while one or more fuse filesystems were present. The fix is to reset the dentry counter in fuse_ctl_kill_sb(). Bug reported by Florent Mertens. Signed-off-by: Miklos Szeredi <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] use __u8 rather than u8 in userspace SIZE defines in hdreg.hMike Frysinger-3/+5
Use __u8 rather than u8 in SIZE defines exported to userspace. Signed-off-by: Mike Frysinger <> Cc: Bartlomiej Zolnierkiewicz <> Cc: Alan Cox <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-01-30[PATCH] knfsd: ratelimit some nfsd messages that are triggered by external ↵NeilBrown-31/+30
events Also remove {NFSD,RPC}_PARANOIA as having the defines doesn't really add anything. The printks covered by RPC_PARANOIA were triggered by badly formatted packets and so should be ratelimited. Signed-off-by: Neil Brown <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>