summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] mutex: trivial whitespace cleanupsIngo Molnar2006-01-102-5/+1
| | | | | Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-01-1050-425/+190
|\
| * [EBTABLES] Don't match tcp/udp source/destination port for IP fragmentsBart De Schuymer2006-01-101-0/+3
| | | | | | | | | | Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [IRDA] DONGLE_OLD: remove dependency on non-existing symbolAdrian Bunk2006-01-101-2/+1
| | | | | | | | | | | | | | | | Jean-Luc Leger <reiga@dspnet.fr.eu.org> reported this alternative dependency on a non-existing symbol. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [IRDA]: kill drivers/net/irda/sir_core.cAdrian Bunk2006-01-106-62/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | EXPORT_SYMBOL's do nowadays belong to the files where the actual functions are. Moving the module_init/module_exit to the file with the actual functions has the advantage of saving a few bytes due to the removal of two functions. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [ATM]: Remove unneeded kmalloc() return value casts + tiny whitespace cleanupJesper Juhl2006-01-101-5/+7
| | | | | | | | | | | | | | | | | | | | Small cleanups for drivers/atm/zatm.c Get rid of unneeded cast of kmalloc() return value. Small whitespace/CodingStyle/formatting cleanup (since I was in there anyway). Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NET]: Remove unneeded kmalloc() return value castsJesper Juhl2006-01-102-3/+3
| | | | | | | | | | | | | | | | Get rid of needless casting of kmalloc() return value in net/ Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [RXRPC]: Decrease number of pointer derefs in connection.cJesper Juhl2006-01-101-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Decrease the number of pointer derefs in net/rxrpc/connection.c Benefits of the patch: - Fewer pointer dereferences should make the code slightly faster. - Size of generated code is smaller - improved readability Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [AF_NETLINK]: Fix DoS in netlink_rcv_skb()Martin Murray2006-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | From: Martin Murray <murrayma@citi.umich.edu> Sanity check nlmsg_len during netlink_rcv_skb. An nlmsg_len == 0 can cause infinite loop in kernel, effectively DoSing machine. Noted by Matin Murray. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NETFILTER]: Fix timeout sysctls on big-endian 64bit architecturesPatrick McHardy2006-01-1013-73/+73
| | | | | | | | | | | | | | | | | | | | The connection tracking timeout variables are unsigned long, but proc_dointvec_jiffies is used with sizeof(unsigned int) in the sysctl tables. Since there is no proc_doulongvec_jiffies function, change the timeout variables to unsigned int. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NETFILTER]: Remove unused function from NAT protocol helpersPatrick McHardy2006-01-106-167/+0
| | | | | | | | | | | | | | ->print and ->print_range are not used (and apparently never were). Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NETFILTER]: Fix return value confusion in PPTP NAT helperPatrick McHardy2006-01-101-23/+13
| | | | | | | | | | | | | | | | ip_nat_mangle_tcp_packet doesn't return NF_* values but 0/1 for failure/success. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NETFILTER]: Fix another crash in ip_nat_pptpPatrick McHardy2006-01-101-30/+27
| | | | | | | | | | | | | | | | | | | | | | The PPTP NAT helper calculates the offset at which the packet needs to be mangled as difference between two pointers to the header. With non-linear skbs however the pointers may point to two seperate buffers on the stack and the calculation results in a wrong offset beeing used. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NETFILTER]: Fix crash in ip_nat_pptpPatrick McHardy2006-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | When an inbound PPTP_IN_CALL_REQUEST packet is received the PPTP NAT helper uses a NULL pointer in pointer arithmentic to calculate the offset in the packet which needs to be mangled and corrupts random memory or crashes. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NETFILTER]: net/ipv[46]/netfilter.c cleanupsPatrick McHardy2006-01-105-32/+11
| | | | | | | | | | | | | | | | Don't wrap entire file in #ifdef CONFIG_NETFILTER, remove a few unneccessary includes. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NET]: Change memcmp(,,ETH_ALEN) to compare_ether_addr()Kris Katterjohn2006-01-1011-25/+26
| | | | | | | | | | | | | | This changes some memcmp(one,two,ETH_ALEN) to compare_ether_addr(one,two). Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [INET]: congestion and af_ops can be constStephen Hemminger2006-01-101-2/+2
| | | | | | | | | | | | | | | | | | The congestion ops and af_ops in the inet_connection_sock can be const. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [PATCH] mark mutex_lock*() as might_sleep()Ingo Molnar2006-01-101-0/+2
| | | | | | | | | | | | | | | | Mark mutex_lock() and mutex_lock_interruptible() as might_sleep() functions. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] fix i386 mutex fastpath on FRAME_POINTER && !DEBUG_MUTEXESIngo Molnar2006-01-102-11/+14
| | | | | | | | | | | | | | | | | | Call the mutex slowpath more conservatively - e.g. FRAME_POINTERS can change the calling convention, in which case a direct branch to the slowpath becomes illegal. Bug found by Hugh Dickins. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] remove unnecessary asm/mutex.h from kernel/mutex-debug.cIngo Molnar2006-01-101-2/+0
|/ | | | | | | | Remove unnecessary (and incorrect) inclusion of asm/mutex.h, pointed out by David Howells. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] moxa serial: add proper capability checkAlan Cox2006-01-101-0/+2
| | | | | | This requires the proper capabilities for the moxa bios update ioctl's. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68knommu: save reg a5 on context changeGreg Ungerer2006-01-101-0/+1
| | | | | | | | Fix a5 register corruption when processing user space signals handlers. We need to save a5 through each contenxt change. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68knommu: fix find_next_zero_bit in bitops.hGreg Ungerer2006-01-101-1/+1
| | | | | | | | | | | | | | | | | | We're starting a number of big applications (memory footprint app. 1MByte) on our Arcturus uC5272. Therefore memory fragmentation is a real pain for us. We've switched to uClinux-2.4.27-uc1 and found that page_alloc2 fragments the memory heavily. Digging into it we found a bug in the find_next_zero_bit function in the m68knommu/bitops.h file. if the size isn't a multiple of 32 than the upper bits of the last word to be searched should be masked. But the functions masks the lower bits of the last word because it uses a right shift instead of a left shift operator. Patch submitted by Sascha Smejkal <s.smejkal@centersystems.at> Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] uclinux: delay binfmt_flat traceGreg Ungerer2006-01-101-7/+10
| | | | | | | | | | | | Modify the initial trace output (which is based on flags in the binary header) so that it is not done until after the magic number check. This may well not be a flat format binary, so the flags could be invalid. (Prime example, running a script). Changes prompted by patches from Stuart Hughs. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68knommu: set irq priority/level different for each ColdFire serial ↵Greg Ungerer2006-01-101-1/+1
| | | | | | | | | | | | | port Set the hardware interrupt priority to a different value for each attached ColdFire serial port. According to the CPU documentation you should not use the same combination of level/priority on more than one device. People have reported odd serial port behavior with them set the same. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68knommu: allow configure of FEC for M520x CPU familyGreg Ungerer2006-01-101-1/+1
| | | | | | | | Allow the ColdFire FEC ethernet driver to be enabled on the M520x CPU family. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68knommu: fix ram length of m5208evb boardGreg Ungerer2006-01-101-1/+1
| | | | | | | | | | Adjust length of M5208EVB ram define. It should size up to 32MB after adding in the dBUG reserved 128k. Problem pointed out be Milton Miller <miltonm@bga.com>. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68knommu: fix a5 reg corruption in signal handlersGreg Ungerer2006-01-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a patch adapted from a posting by Andrea Tarani which was pointed out to me by Bernardo Innocenti. Thanks to both of them for their help and patience. The original posting is here: http://mailman.uclinux.org/pipermail/uclinux-dev/2005-July/033543.html The problem first manifest itself as busybox ping terminating with an "Illegal instruction". I reduced this to a test case and found that variable size arrays allocated on the stack could lead to stacks not aligned on 32 bit boundaries. For the Coldfire this proved fatal. Having been pointed out this patch by Bernardo, I applied it and it fixed the first test case. I then went back to busybox's ping. This still failed with "Illegal instruction", but in a different way. Before it depended on the size allocated for the ping buffer, now it happened every time. I also found it depended on optimisation level (gcc-3.4.0) -Os was okay but not -O2. After a lot of looking, it turned out that register a5 was being corrupted by the signal handler (after applying the patch). I re-worked the patch a bit to save/restore a5 and now all seems well. Patch submitted by Stuart Hughs <stuarth@freescale.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68knommu: fix mangled 'truct' in ptrace.cGreg Ungerer2006-01-101-1/+1
| | | | | | | Fix broken "truct" -> "struct" in arch_ptrace() parameter list. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68knommu: don't set gcc optimizer flagsGreg Ungerer2006-01-101-1/+0
| | | | | | | | Don't specify compiler optimization flags in the m68knommu Makefile. Let the top level Makefile/config set it. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] h8300: remove MAGIC_ROM_PTR from memory.cGreg Ungerer2006-01-101-13/+0
| | | | | | | Remove obsolete MAGIC_ROM_PTR code from h8300 architecture. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] h8300: remove MAGIC_ROM_PTR from k8300_ksyms.cGreg Ungerer2006-01-101-4/+0
| | | | | | | Remove obsolete MAGIC_ROM_PTR code from h8300 architecture. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2006-01-1098-190/+285
|\
| * MIPS: Malta: Change CPU default to R2.Ralf Baechle2006-01-101-5/+5
| | | | | | | | | | | | | | | | ... giving those with with R1 or older CPU cards more rope to missconfigure their kernels. But MIPS is only selling R2 CPUs since two or three years already. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: R2: Set 64BIT_PHYS_ADDR for R2 processor also.Ralf Baechle2006-01-101-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: R2: Try to bulletproof instruction_hazard against miss-compilation.Ralf Baechle2006-01-101-5/+15
| | | | | | | | | | | | | | | | | | | | | | Gcc has a tradition of misscompiling the previous construct using the address of a label as argument to inline assembler. Gas otoh has the annoying difference between la and dla which are only usable for 32-bit rsp. 64-bit code, so can't be used without conditional compilation. The alterantive is switching the assembler to 64-bit code which happens to work right even for 32-bit code ... Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: R2: Fix local_irq_save()Maxime Bizon2006-01-101-0/+1
| | | | | | | | | | | | | | | | | | local_irq_restore uses di which saves the whole status content, not just the IE bit resulting in local_irq_restore() to fail. This only happens if both CONFIG_CPU_MIPSR2 and CONFIG_IRQ_CPU are enabled. Signed-off-by: Maxime Bizon <mbizon@freebox.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Don't pass -finline-limit=100000.Ralf Baechle2006-01-101-1/+0
| | | | | | | | | | | | | | | | | | This was a stop gap meassure for gcc 3.3 and newer sometimes not inlining inline functions in the 2.4 days. Starting we pass the always_inline attribute, so -finline-limit is no longer necessary and it's been shown to problematic on Sparc. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Namespace pollution: dump_regs() -> elf_dump_regs()Al Viro2006-01-102-4/+4
| | | | | | | | | | | | | | | | | | dump_regs() is used by a bunch of drivers for their internal stuff; renamed mips instance (one that is seen in system-wide headers) to elf_dump_regs() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Remove unused CONFIG_CPU_HAS_LLDSCD.Ralf Baechle2006-01-1024-31/+0
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Au1550: Fix OHCI memory map sizeSergei Shtylyov2006-01-101-2/+5
| | | | | | | | | | | | | | | | | | | | USB OpenHCI host controller on Au1550 only decodes memory addresses from 0x14020000 to 0x1407FFFF according to the databook, which gives 0x60000 (on the prior Au1x00 chips the map size was 1MB). Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Acked-by: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Update Yoichi Yuasa's email address.Ralf Baechle2006-01-1038-46/+46
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Oprofile: Add 5K, 20K and 25K support.Ralf Baechle2006-01-102-0/+15
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Oprofile: Print error message if the CPU happen to have no counters.Ralf Baechle2006-01-101-1/+3
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@ongar.mips.com>
| * MIPS: Oprofile: Fixup the loose ends in the plumbing.Ralf Baechle2006-01-104-7/+49
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Reorganize ISA constants strictly as bitmasks.Ralf Baechle2006-01-102-31/+31
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@ongar.mips.com>
| * MIPS: MIPS boards: Get rid of useless SMP/non-SMP casing.Ralf Baechle2006-01-101-13/+2
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Introduce machinery for testing for MIPSxxR1/2.Ralf Baechle2006-01-1011-9/+95
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Rename MIPS_CPU_ISA_M{32,64} -> MIPS_CPU_ISA_M{32,64}R1.Ralf Baechle2006-01-104-19/+16
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: MT: Fix 32-bit dependencies.Ralf Baechle2006-01-101-4/+4
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
OpenPOWER on IntegriCloud