aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6Linus Torvalds2006-01-09198-649/+2754
|\
| * [PATCH] mutex subsystem, semaphore to completion: drivers/block/loop.cIngo Molnar2006-01-092-17/+14
| | | | | | | | | | | | convert the block loop device from semaphores to completions. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, semaphore to completion: IDE ->gendev_rel_semAleksey Makarov2006-01-093-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch changes semaphores that are initialized as locked to complete(). Source: MontaVista Software, Inc. Modified-by: Steven Rostedt <rostedt@goodmis.org> The following patch is from Montavista. I modified it slightly. Semaphores are currently being used where it makes more sense for completions. This patch corrects that. Signed-off-by: Aleksey Makarov <amakarov@ru.mvista.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, semaphore to completion: CPU3WDTSteven Rostedt2006-01-091-4/+5
| | | | | | | | | | | | change CPU3WDT semaphores to completions. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, semaphore to completion: SX8Steven Rostedt2006-01-091-6/+6
| | | | | | | | | | | | change SX8 semaphores to completions. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, semaphore to mutex: VFS, sb->s_lockIngo Molnar2006-01-094-6/+6
| | | | | | | | | | | | | | This patch converts the superblock-lock semaphore to a mutex, affecting lock_super()/unlock_super(). Tested on ext3 and XFS. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, semaphore to mutex: VFS, ->i_semJes Sorensen2006-01-09113-573/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the inode semaphore to a mutex. I have tested it on XFS and compiled as much as one can consider on an ia64. Anyway your luck with it might be different. Modified-by: Ingo Molnar <mingo@elte.hu> (finished the conversion) Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, semaphore to mutex: XFSJes Sorensen2006-01-0910-26/+22
| | | | | | | | | | | | | | | | | | | | This patch switches XFS over to use the new mutex code directly as opposed to the previous workaround patch I posted earlier that avoided the namespace clash by forcing it back to semaphores. This falls in the 'works for me<tm>' category. Signed-off-by: Jes Sorensen <jes@trained-monkey.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, more debugging codeIngo Molnar2006-01-097-0/+37
| | | | | | | | | | | | | | | | more mutex debugging: check for held locks during memory freeing, task exit, enable sysrq printouts, etc. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
| * [PATCH] mutex subsystem, debugging codeIngo Molnar2006-01-097-0/+637
| | | | | | | | | | | | | | mutex implementation - add debugging code. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
| * [PATCH] mutex subsystem, documentationIngo Molnar2006-01-092-8/+149
| | | | | | | | | | | | | | Add mutex design related documentation. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
| * [PATCH] mutex subsystem, coreIngo Molnar2006-01-094-1/+480
| | | | | | | | | | | | | | mutex implementation, core files: just the basic subsystem, no users of it. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
| * [PATCH] mutex subsystem, add default include/asm-*/mutex.h filesArjan van de Ven2006-01-0919-0/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | add the per-arch mutex.h files for the remaining architectures. We default to asm-generic/mutex-dec.h, because that performs quite well on most arches. Arches that do not have atomic decrement/increment instructions should switch to mutex-xchg.h instead. Arches can also provide their own implementation for the mutex fastpath primitives. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, add include/asm-arm/mutex.hNicolas Pitre2006-01-091-0/+128
| | | | | | | | | | | | | | add the ARM version of mutex.h, which is optimized in assembly for ARMv6, and uses the xchg implementation on pre-ARMv6. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, add include/asm-x86_64/mutex.hIngo Molnar2006-01-091-0/+113
| | | | | | | | | | | | | | add the x86_64 version of mutex.h, optimized in assembly. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
| * [PATCH] mutex subsystem, add include/asm-i386/mutex.hArjan van de Ven2006-01-091-0/+124
| | | | | | | | | | | | | | add the i386 version of mutex.h, optimized in assembly. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, add asm-generic/mutex-[dec|xchg|null].h implementationsIngo Molnar2006-01-093-0/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add three (generic) mutex fastpath implementations. The mutex-xchg.h implementation is atomic_xchg() based, and should work fine on every architecture. The mutex-dec.h implementation is atomic_dec_return() based - this one too should work on every architecture, but might not perform the most optimally on architectures that have no atomic-dec/inc instructions. The mutex-null.h implementation forces all calls into the slowpath. This is used for mutex debugging, but it can also be used on platforms that do not want (or need) a fastpath at all. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
| * [PATCH] mutex subsystem, add typecheck_fn(type, function)Chuck Ebbert2006-01-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | add typecheck_fn(type, function) to do type-checking of function pointers. Modified-by: Ingo Molnar <mingo@elte.hu> (made it typeof() based, instead of typedef based.) Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * [PATCH] mutex subsystem, add atomic_xchg() to all archesIngo Molnar2006-01-0922-0/+30
| | | | | | | | | | | | | | add atomic_xchg() to all the architectures. Needed by the new mutex code. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-01-0940-349/+50
|\ \
| * | Small fixups to the EHCI Kconfig help textJesper Juhl2006-01-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Here's a small patch with a few tiny fixups for the EHCI Kconfig help text. Please consider applying. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Documentation/filesystems/proc.txt: indentation fixAdrian Bunk2006-01-101-1/+1
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | remove the outdated arch/i386/kernel/cpu/{,mtrr/}changelogAdrian Bunk2006-01-102-292/+0
| | | | | | | | | | | | | | | | | | | | | This patch removes two outdated changelog files. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Jones <davej@redhat.com>
| * | MAINTAINERS: remove BUSLOGIC entryAdrian Bunk2006-01-101-7/+0
| | | | | | | | | | | | | | | | | | Leonard N. Zubkoff passed away in August 2002. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | spelling: s/trough/through/Adrian Bunk2006-01-108-10/+10
| | | | | | | | | | | | | | | | | | Additionally, one comment was reformulated by Joe Perches <joe@perches.com>. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | spelling: s/retreive/retrieve/Adrian Bunk2006-01-1017-20/+20
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | s/assoicated/associated/Adrian Bunk2006-01-101-1/+1
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | spelling: s/usefull/useful/Adrian Bunk2006-01-109-13/+13
| |/ | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* | [PATCH] rcu: don't set ->next_pending in rcu_start_batch()Oleg Nesterov2006-01-091-7/+4
| | | | | | | | | | | | | | | | | | | | I think it is better to set ->next_pending in the caller, when it is needed. This saves one parameter, and this coincides with cpu_quiet() beahaviour, which sets ->completed = ->cur itself. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Paul E. McKenney <paulmck@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-01-0968-747/+1022
|\ \
| * | [INET_DIAG]: Introduce sk_diag_fillArnaldo Carvalho de Melo2006-01-091-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | To be called from inet_diag_get_exact, also rename inet_diag_fill to inet_csk_diag_fill, for consistency with inet_twsk_diag_fill. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [INET_DIAG]: Introduce inet_twsk_diag_dump & inet_twsk_diag_fillArnaldo Carvalho de Melo2006-01-091-47/+111
| | | | | | | | | | | | | | | | | | | | | | | | To properly dump TIME_WAIT sockets and to reduce complexity a bit by having per socket class accessor routines. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [INET_DIAG]: whitespace/simple cleanupsArnaldo Carvalho de Melo2006-01-091-29/+28
| | | | | | | | | | | | | | | Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [INET_DIAG]: Use inet_twsk() with TIME_WAIT socketsArnaldo Carvalho de Melo2006-01-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The fields being accessed in inet_diag_dump are outside sock_common, the common part of struct sock and struct inet_timewait_sock. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPV6]: Set skb->priority in ip6_output.cPatrick McHardy2006-01-091-0/+4
| | | | | | | | | | | | | | | | | | | | | Set skb->priority = sk->sk_priority as in raw.c and IPv4. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPV4]: ip_output.c needs xfrm.hPatrick McHardy2006-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a warning from my IPsec patches: CC net/ipv4/ip_output.o net/ipv4/ip_output.c: In function 'ip_finish_output': net/ipv4/ip_output.c:208: warning: implicit declaration of function 'xfrm4_output_finish' Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [PKT_SCHED]: Fix qdisc return code.Jamal Hadi Salim2006-01-094-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | The mapping between TC_ACTION_SHOT and the qdisc return codes is better suited to NET_XMIT_BYPASS so as not to confuse TCP Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET]: Add IFB (Intermediate Functional Block) network device.Jamal Hadi Salim2006-01-093-0/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new device to do intermidiate functional block in a system shared manner. To use the new functionality, you need to turn on qos/classifier actions. The new functionality can be grouped as: 1) qdiscs/policies that are per device as opposed to system wide. ifb allows for a device which can be redirected to thus providing an impression of sharing. 2) Allows for queueing incoming traffic for shaping instead of dropping. Packets are redirected to this device using tc/action mirred redirect construct. If they are sent to it by plain routing instead then they will merely be dropped and the stats would indicate that. Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [AX25] mkiss: Drop spinlock before sleeping call.Ralf Baechle2006-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | With the previous missing-unlock fix the spinlock is dropped only after the tty->driver->write() call which might sleep. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET]: Change some "if (x) BUG();" to "BUG_ON(x);"Kris Katterjohn2006-01-0911-40/+21
| | | | | | | | | | | | | | | | | | | | | This changes some simple "if (x) BUG();" statements to "BUG_ON(x);" Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [PKT_SCHED]: Prefix tc actions with act_Patrick McHardy2006-01-098-8/+8
| | | | | | | | | | | | | | | | | | | | | Clean up the net/sched directory a bit by prefix all actions with act_. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [PKT_SCHED]: Fix memory leak when dumping in pedit actionPatrick McHardy2006-01-091-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [PKT_SCHED]: Remove some obsolete policer exportsPatrick McHardy2006-01-091-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | Also make sure the legacy code is only built when CONFIG_NET_CLS_ACT is not set. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [PKT_SCHED]: Convert tc action functions to single skb pointersPatrick McHardy2006-01-098-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | tcf_action_exec only gets a single skb pointer and doesn't own the skb, but passes double skb pointers (to a local variable) to the action functions. Change to use single skb pointers everywhere. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [PKT_SCHED]: Use USEC_PER_SECPatrick McHardy2006-01-092-15/+16
| | | | | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET]: Convert net/{ipv4,ipv6,sched} to netdev_privPatrick McHardy2006-01-096-66/+63
| | | | | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [CRYPTO] cipher: Set alignmask for multi-byte loadsHerbert Xu2006-01-0910-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Many cipher implementations use 4-byte/8-byte loads/stores which require alignment on some architectures. This patch explicitly sets the alignment requirements for them. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | [CRYPTO] api: Require block size to be less than PAGE_SIZE/8Herbert Xu2006-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | The cipher code path may allocate up to two blocks of data on the stack. Therefore we need to place limits on the maximum block size. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | [CRYPTO] sha1: Fixed off-by-64 bug in sha1_updateHerbert Xu2006-01-091-2/+2
| | | | | | | | | | | | | | | | | | After a partial update, the done pointer is off to the right by 64 bytes. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | [CRYPTO] aes-i586: Remove unused variable ls_tabDaniel Marjamäki2006-01-091-10/+0
| | | | | | | | | | | | | | | | | | | | | It is assigned but never read. Signed-off-by: Daniel Marjamäki <daniel.marjamaki@comhem.se> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>