Maxime Bizon [Tue, 20 Dec 2005 05:32:19 +0000 (06:32 +0100)]
MIPS: R2: Fix local_irq_save()
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>
Ralf Baechle [Wed, 21 Dec 2005 02:02:26 +0000 (03:02 +0100)]
MIPS: Don't pass -finline-limit=100000.
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>
Al Viro [Fri, 16 Dec 2005 22:40:47 +0000 (22:40 +0000)]
MIPS: Namespace pollution: dump_regs() -> elf_dump_regs()
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>
Ralf Baechle [Sat, 17 Dec 2005 21:11:02 +0000 (21:11 +0000)]
MIPS: Remove unused CONFIG_CPU_HAS_LLDSCD.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Sergei Shtylyov [Fri, 25 Nov 2005 19:08:08 +0000 (22:08 +0300)]
MIPS: Au1550: Fix OHCI memory map size
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>
Ralf Baechle [Mon, 12 Dec 2005 20:11:50 +0000 (20:11 +0000)]
Update Yoichi Yuasa's email address.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 9 Dec 2005 12:42:13 +0000 (12:42 +0000)]
MIPS: Oprofile: Add 5K, 20K and 25K support.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 9 Dec 2005 12:34:45 +0000 (12:34 +0000)]
MIPS: Oprofile: Print error message if the CPU happen to have no counters.
Signed-off-by: Ralf Baechle <ralf@ongar.mips.com>
Ralf Baechle [Fri, 9 Dec 2005 12:29:38 +0000 (12:29 +0000)]
MIPS: Oprofile: Fixup the loose ends in the plumbing.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 9 Dec 2005 12:20:49 +0000 (12:20 +0000)]
MIPS: Reorganize ISA constants strictly as bitmasks.
Signed-off-by: Ralf Baechle <ralf@ongar.mips.com>
Ralf Baechle [Fri, 9 Dec 2005 12:09:22 +0000 (12:09 +0000)]
MIPS: MIPS boards: Get rid of useless SMP/non-SMP casing.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 8 Dec 2005 14:04:24 +0000 (14:04 +0000)]
MIPS: Introduce machinery for testing for MIPSxxR1/2.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 8 Dec 2005 13:00:20 +0000 (13:00 +0000)]
MIPS: Rename MIPS_CPU_ISA_M{32,64} -> MIPS_CPU_ISA_M{32,64}R1.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 8 Dec 2005 00:32:23 +0000 (00:32 +0000)]
MIPS: MT: Fix 32-bit dependencies.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 7 Dec 2005 18:57:52 +0000 (18:57 +0000)]
MIPS: Get rid of atomic_lock.
It was resulting in build errors for some configurations.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 7 Dec 2005 18:04:40 +0000 (18:04 +0000)]
MIPS: FP: Remove silly trick to avoid warning.
Just doesn't fool a modern compiler anymore.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 7 Dec 2005 17:52:40 +0000 (17:52 +0000)]
MIPS: DSP: Put mask field into the right place.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 7 Dec 2005 17:50:48 +0000 (17:50 +0000)]
MIPS: DSP: Put DSPcontrol register into the right place in the signal frame.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Tue, 6 Dec 2005 09:43:20 +0000 (09:43 +0000)]
MIPS: DSP: Set all register masks to 0x3ff.
0x2ff was a typo and the value 0x1f of DSP_MASK was refering to an old
version of the documentation.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Wed, 30 Nov 2005 04:33:26 +0000 (13:33 +0900)]
MIPS: Fix mdelay(1) for 64bit kernel with HZ == 1000
mdelay(1) (i.e. udelay(1000)) does not work correctly due to overflow.
1000 * 0x004189374BC6A7f0 = 0x10000000000000180 (>= 2**64)
0x004189374BC6A7ef (0x004189374BC6A7f0 - 1) is OK and it is exactly
same as catchall case (0x8000000000000000UL / (500000 / HZ)).
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 5 Dec 2005 13:47:25 +0000 (13:47 +0000)]
MIPS: DSP: eleminate used_dsp.
used_dsp was meant to be used like used_math - but since the FPU context
is small and lazy context switching is a stupid idea on multiprocessors
this idea only got halfway implemented and those bits are were now
breaking ptrace.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 5 Dec 2005 13:39:25 +0000 (13:39 +0000)]
MIPS: DSP: Context switch the DSPcontrol register also.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Linus Torvalds [Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6
Linus Torvalds [Tue, 10 Jan 2006 01:31:38 +0000 (17:31 -0800)]
Merge /pub/scm/linux/kernel/git/mingo/mutex-2.6
Linus Torvalds [Tue, 10 Jan 2006 01:06:53 +0000 (17:06 -0800)]
Merge git://git./linux/kernel/git/bunk/trivial
Oleg Nesterov [Sun, 8 Jan 2006 19:19:33 +0000 (22:19 +0300)]
[PATCH] rcu: don't set ->next_pending in rcu_start_batch()
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>
Ingo Molnar [Mon, 9 Jan 2006 23:59:27 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, semaphore to completion: drivers/block/loop.c
convert the block loop device from semaphores to completions.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Aleksey Makarov [Mon, 9 Jan 2006 23:59:27 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, semaphore to completion: IDE ->gendev_rel_sem
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>
Steven Rostedt [Mon, 9 Jan 2006 23:59:26 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, semaphore to completion: CPU3WDT
change CPU3WDT semaphores to completions.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Steven Rostedt [Mon, 9 Jan 2006 23:59:26 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, semaphore to completion: SX8
change SX8 semaphores to completions.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar [Mon, 9 Jan 2006 23:59:25 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, semaphore to mutex: VFS, sb->s_lock
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>
Jes Sorensen [Mon, 9 Jan 2006 23:59:24 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, semaphore to mutex: VFS, ->i_sem
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>
Jes Sorensen [Mon, 9 Jan 2006 23:59:21 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, semaphore to mutex: XFS
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>
Ingo Molnar [Mon, 9 Jan 2006 23:59:21 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, more debugging code
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>
Ingo Molnar [Mon, 9 Jan 2006 23:59:20 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, debugging code
mutex implementation - add debugging code.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Ingo Molnar [Mon, 9 Jan 2006 23:59:20 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, documentation
Add mutex design related documentation.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Ingo Molnar [Mon, 9 Jan 2006 23:59:19 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, core
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>
Arjan van de Ven [Mon, 9 Jan 2006 23:59:19 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, add default include/asm-*/mutex.h files
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>
Nicolas Pitre [Mon, 9 Jan 2006 23:59:18 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, add include/asm-arm/mutex.h
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>
Ingo Molnar [Mon, 9 Jan 2006 23:59:18 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, add include/asm-x86_64/mutex.h
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>
Arjan van de Ven [Mon, 9 Jan 2006 23:59:18 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, add include/asm-i386/mutex.h
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>
Ingo Molnar [Mon, 9 Jan 2006 23:59:17 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, add asm-generic/mutex-[dec|xchg|null].h implementations
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>
Chuck Ebbert [Mon, 9 Jan 2006 23:59:17 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, add typecheck_fn(type, function)
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>
Ingo Molnar [Mon, 9 Jan 2006 23:59:17 +0000 (15:59 -0800)]
[PATCH] mutex subsystem, add atomic_xchg() to all arches
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>
Jesper Juhl [Mon, 9 Jan 2006 23:35:22 +0000 (00:35 +0100)]
Small fixups to the EHCI Kconfig help text
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>
Adrian Bunk [Mon, 9 Jan 2006 23:20:30 +0000 (00:20 +0100)]
Documentation/filesystems/proc.txt: indentation fix
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Adrian Bunk [Mon, 9 Jan 2006 23:15:25 +0000 (00:15 +0100)]
remove the outdated arch/i386/kernel/cpu/{,mtrr/}changelog
This patch removes two outdated changelog files.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Jones <davej@redhat.com>
Adrian Bunk [Mon, 9 Jan 2006 23:13:57 +0000 (00:13 +0100)]
MAINTAINERS: remove BUSLOGIC entry
Leonard N. Zubkoff passed away in August 2002.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Adrian Bunk [Mon, 9 Jan 2006 23:13:33 +0000 (00:13 +0100)]
spelling: s/trough/through/
Additionally, one comment was reformulated by Joe Perches <joe@perches.com>.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Linus Torvalds [Mon, 9 Jan 2006 23:12:52 +0000 (15:12 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 9 Jan 2006 23:10:22 +0000 (15:10 -0800)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
Adrian Bunk [Mon, 9 Jan 2006 23:10:13 +0000 (00:10 +0100)]
spelling: s/retreive/retrieve/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Adrian Bunk [Mon, 9 Jan 2006 23:09:36 +0000 (00:09 +0100)]
s/assoicated/associated/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Linus Torvalds [Mon, 9 Jan 2006 23:09:30 +0000 (15:09 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 9 Jan 2006 23:09:03 +0000 (15:09 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Mon, 9 Jan 2006 23:08:33 +0000 (15:08 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Adrian Bunk [Mon, 9 Jan 2006 23:08:17 +0000 (00:08 +0100)]
spelling: s/usefull/useful/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Arnaldo Carvalho de Melo [Mon, 9 Jan 2006 22:56:56 +0000 (14:56 -0800)]
[INET_DIAG]: Introduce sk_diag_fill
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>
Arnaldo Carvalho de Melo [Mon, 9 Jan 2006 22:56:38 +0000 (14:56 -0800)]
[INET_DIAG]: Introduce inet_twsk_diag_dump & inet_twsk_diag_fill
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>
Arnaldo Carvalho de Melo [Mon, 9 Jan 2006 22:56:19 +0000 (14:56 -0800)]
[INET_DIAG]: whitespace/simple cleanups
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Arnaldo Carvalho de Melo [Mon, 9 Jan 2006 22:56:03 +0000 (14:56 -0800)]
[INET_DIAG]: Use inet_twsk() with TIME_WAIT sockets
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>
Pierre Ossman [Mon, 9 Jan 2006 22:51:46 +0000 (22:51 +0000)]
[MMC] Indicate that R1/R1b contains command opcode
Some controllers actually check the first byte of the response (most
don't). This byte contains the command opcode for R1/R1b and all 1:s
for other types. The difference must be indicated to the controller
so it knows which reply to expect.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
David S. Miller [Mon, 9 Jan 2006 22:36:49 +0000 (14:36 -0800)]
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
Richard Mortimer [Mon, 9 Jan 2006 22:35:50 +0000 (14:35 -0800)]
[SPARC64]: Fix ptrace/strace
Don't clobber register %l0 while checking TI_SYS_NOERROR value in
syscall return path. This bug was introduced by:
db7d9a4eb700be766cc9f29241483dbb1e748832
Problem narrowed down by Luis F. Ortiz and Richard Mortimer.
I tried using %l2 as suggested by Luis and that works for me.
Looking at the code I wonder if it makes sense to simplify the code
a little bit. The following works for me but I'm not sure how to
exercise the "NOERROR" codepath.
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy [Mon, 9 Jan 2006 06:37:26 +0000 (22:37 -0800)]
[IPV6]: Set skb->priority in ip6_output.c
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>
Patrick McHardy [Mon, 9 Jan 2006 06:36:54 +0000 (22:36 -0800)]
[IPV4]: ip_output.c needs xfrm.h
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>
Jamal Hadi Salim [Mon, 9 Jan 2006 06:35:55 +0000 (22:35 -0800)]
[PKT_SCHED]: Fix qdisc return code.
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>
Jamal Hadi Salim [Mon, 9 Jan 2006 06:34:25 +0000 (22:34 -0800)]
[NET]: Add IFB (Intermediate Functional Block) network device.
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>
Ralf Baechle [Mon, 9 Jan 2006 06:31:04 +0000 (22:31 -0800)]
[AX25] mkiss: Drop spinlock before sleeping call.
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>
Kris Katterjohn [Mon, 9 Jan 2006 06:24:28 +0000 (22:24 -0800)]
[NET]: Change some "if (x) BUG();" to "BUG_ON(x);"
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>
Patrick McHardy [Mon, 9 Jan 2006 06:22:14 +0000 (22:22 -0800)]
[PKT_SCHED]: Prefix tc actions with act_
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>
Patrick McHardy [Mon, 9 Jan 2006 06:17:27 +0000 (22:17 -0800)]
[PKT_SCHED]: Fix memory leak when dumping in pedit action
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy [Mon, 9 Jan 2006 06:16:25 +0000 (22:16 -0800)]
[PKT_SCHED]: Remove some obsolete policer exports
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>
Patrick McHardy [Mon, 9 Jan 2006 06:15:34 +0000 (22:15 -0800)]
[PKT_SCHED]: Convert tc action functions to single skb pointers
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>
Patrick McHardy [Mon, 9 Jan 2006 06:12:03 +0000 (22:12 -0800)]
[PKT_SCHED]: Use USEC_PER_SEC
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy [Mon, 9 Jan 2006 06:05:26 +0000 (22:05 -0800)]
[NET]: Convert net/{ipv4,ipv6,sched} to netdev_priv
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Herbert Xu [Sat, 7 Jan 2006 05:38:15 +0000 (16:38 +1100)]
[CRYPTO] cipher: Set alignmask for multi-byte loads
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>
Herbert Xu [Sat, 7 Jan 2006 05:24:15 +0000 (16:24 +1100)]
[CRYPTO] api: Require block size to be less than PAGE_SIZE/8
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>
Herbert Xu [Wed, 21 Dec 2005 11:01:58 +0000 (19:01 +0800)]
[CRYPTO] sha1: Fixed off-by-64 bug in sha1_update
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>
Daniel Marjamäki [Sat, 3 Dec 2005 06:16:42 +0000 (17:16 +1100)]
[CRYPTO] aes-i586: Remove unused variable ls_tab
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>
Denis Vlasenko [Tue, 29 Nov 2005 11:23:20 +0000 (22:23 +1100)]
[CRYPTO] aes-i586: Nano-optimisation on key length check
Reduce the number of comparisons by one through the use of jb/je.
This patch also corrects the comments regarding the different key
lengths.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Herbert Xu [Tue, 29 Nov 2005 11:04:41 +0000 (22:04 +1100)]
[CRYPTO] cipher: Align temporary buffer in cbc_process_decrypt
Since the temporary buffer is used as an argument to cia_decrypt, it must be
aligned by cra_alignmask. This bug was found by linux@horizon.com.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Nicolas Pitre [Sun, 13 Nov 2005 00:17:33 +0000 (11:17 +1100)]
[CRYPTO] sha1: Avoid shifting count left and right
This patch avoids shifting the count left and right needlessly for each
call to sha1_update(). It instead can be done only once at the end in
sha1_final().
Keeping the previous test example (sha1_update() successively called with
len=64), a 1.3% performance increase can be observed on i386, or 0.2% on
ARM. The generated code is also smaller on ARM.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Nicolas Pitre [Sat, 12 Nov 2005 23:59:54 +0000 (10:59 +1100)]
[CRYPTO] sha1: Rename i/j to done/partial
This patch gives more descriptive names to the variables i and j.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Nicolas Pitre [Sat, 12 Nov 2005 23:47:20 +0000 (10:47 +1100)]
[CRYPTO] sha1: Avoid useless memcpy()
The current code unconditionally copy the first block for every call to
sha1_update(). This can be avoided if there is no pending partial block.
This is always the case on the first call to sha1_update() (if the length
is >= 64 of course.
Furthermore, temp does need to be called if sha_transform is never invoked.
Also consolidate the sha_transform calls into one to reduce code size.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Herbert Xu [Sat, 5 Nov 2005 07:06:26 +0000 (18:06 +1100)]
[CRYPTO] Allow AES C/ASM implementations to coexist
As the Crypto API now allows multiple implementations to be registered
for the same algorithm, we no longer have to play tricks with Kconfig
to select the right AES implementation.
This patch sets the driver name and priority for all the AES
implementations and removes the Kconfig conditions on the C implementation
for AES.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Herbert Xu [Sat, 5 Nov 2005 05:58:14 +0000 (16:58 +1100)]
[CRYPTO] Allow multiple implementations of the same algorithm
This is the first step on the road towards asynchronous support in
the Crypto API. It adds support for having multiple crypto_alg objects
for the same algorithm registered in the system.
For example, each device driver would register a crypto_alg object
for each algorithm that it supports. While at the same time the
user may load software implementations of those same algorithms.
Users of the Crypto API may then select a specific implementation
by name, or choose any implementation for a given algorithm with
the highest priority.
The priority field is a 32-bit signed integer. In future it will be
possible to modify it from user-space.
This also provides a solution to the problem of selecting amongst
various AES implementations, that is, aes vs. aes-i586 vs. aes-padlock.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Herbert Xu [Sun, 30 Oct 2005 10:25:15 +0000 (21:25 +1100)]
[CRYPTO] Use standard byte order macros wherever possible
A lot of crypto code needs to read/write a 32-bit/64-bit words in a
specific gender. Many of them open code them by reading/writing one
byte at a time. This patch converts all the applicable usages over
to use the standard byte order macros.
This is based on a previous patch by Denis Vlasenko.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Herbert Xu [Sun, 30 Oct 2005 09:44:37 +0000 (20:44 +1100)]
[PADLOCK] Fix sparse warning about 1-bit signed bit-field
Change the bit-field in struct cword to unsigned to shut sparse up.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
David S. Miller [Mon, 9 Jan 2006 21:59:12 +0000 (13:59 -0800)]
[SPARC64]: Add needed pm_power_off symbol.
Signed-off-by: David S. Miller <davem@davemloft.net>
Ben Dooks [Mon, 9 Jan 2006 21:16:18 +0000 (21:16 +0000)]
[ARM] 3246/1: S3C24XX - retab clock list in arch/arm/mach-s3c2410/clock.c
Patch from Ben Dooks
Properly tabulate the clock table in arch/arm/mach-s3c2410/clock.c
and put the requisite commas on the end of the structs.
Fix the comment about clock enable and disable in the setup code
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 9 Jan 2006 21:12:17 +0000 (21:12 +0000)]
[MMC] Add DATA_MULTI flag
Some hosts need to know that a transfer will be multi-block.
Add a data flag to indicate multiple data block transfers.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Torvalds [Mon, 9 Jan 2006 21:03:58 +0000 (13:03 -0800)]
Merge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
Alexey Dobriyan [Mon, 9 Jan 2006 21:09:16 +0000 (00:09 +0300)]
[PATCH] Fix more "if ((err = foo() < 0))" typos
Another reason to use:
ret = foo();
if (ret < 0)
goto out;
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hugh Dickins [Mon, 9 Jan 2006 20:46:49 +0000 (20:46 +0000)]
[PATCH] Fix sg_page_malloc() memset
sg_page_malloc should clear the data buffer, not that extent of mem_map.
This fixes Jesper's sg_page_free "Bad page states"
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Mon, 9 Jan 2006 20:21:40 +0000 (18:21 -0200)]
V4L/DVB (3336): Bluebird firmware hosting moved to common dvb firmware dir on linuxtv.org
- Get_dvb_firmware script updated accordingly:
- my $url = "http://www.linuxtv.org/~mkrufky/dvb-usb-bluebird-01.fw";
+ my $url = "http://www.linuxtv.org/download/dvb/firmware/dvb-usb-blue$
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Chris Pascoe [Mon, 9 Jan 2006 20:21:39 +0000 (18:21 -0200)]
V4L/DVB (3329): cx88_subids whitespace cleanup
- Clean up a recently introduced spaces vs tabs whitespace problem.
Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Michael Krufky [Mon, 9 Jan 2006 20:21:38 +0000 (18:21 -0200)]
V4L/DVB (3328): replace omitted 'TODO:'
- replace omitted 'TODO:'
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Patrick Boettcher [Mon, 9 Jan 2006 20:21:38 +0000 (18:21 -0200)]
V4L/DVB (3327): Remove DViCO specific firmware hacks from the generic code.
- Move the code that patches bluebird firmware before upload from the
generic code into the cxusb driver itself.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Hans Verkuil [Mon, 9 Jan 2006 20:21:37 +0000 (18:21 -0200)]
V4L/DVB (3326): Fix stereo and standard reporting of msp3400 (esp. for radio)
- Add VIDIOC_LOG_STATUS to the radio device ioctl list.
- Reduce the confusion between modes and standards
- Fix stereo reporting for radio.
- Don't set i2c configuration if the chip doesn't support it.
- Fix reporting of current standard for radio.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>