GitHub/exynos8895/android_kernel_samsung_universal8895.git
18 years ago[PATCH] slab: Avoid deadlock at kmem_cache_create/kmem_cache_destroy
Ravikiran G Thirumalai [Fri, 10 Feb 2006 09:51:13 +0000 (01:51 -0800)]
[PATCH] slab: Avoid deadlock at kmem_cache_create/kmem_cache_destroy

Prevents deadlock situation between
kmem_cache_create()/kmem_cache_destory(), and kmem_cache_create() /cpu
hotplug.  The locking order probably got moved over time.

Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Shai Fultheim <shai@scalex86.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] shmdt cannot detach not-alined shm segment cleanly.
KAMEZAWA Hiroyuki [Fri, 10 Feb 2006 09:51:12 +0000 (01:51 -0800)]
[PATCH] shmdt cannot detach not-alined shm segment cleanly.

sys_shmdt() can manage shm segments which are covered by multiple vmas.  (This
can happen when a user uses mprotect() after shmat().)

This works well if shm is aligned to PAGE_SIZE, but if not, the last
segment cannot be detached.  It is because a comparison in sys_shmdt()

(vma->vm_end - addr) < size
addr == return address of shmat()
size == shmsize, argments to shmget()

size should be aligned to PAGE_SIZE before being compared with vma->vm_end,
which is aligned.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Acked-by: Hugh Dickins <hugh@veritas.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] prevent recursive panic from softlockup watchdog
Jan Beulich [Fri, 10 Feb 2006 09:51:11 +0000 (01:51 -0800)]
[PATCH] prevent recursive panic from softlockup watchdog

When panic_timeout is zero, suppress triggering a nested panic due to soft
lockup detection.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86: don't initialise cpu_possible_map to all ones
Andrew Morton [Fri, 10 Feb 2006 09:51:08 +0000 (01:51 -0800)]
[PATCH] x86: don't initialise cpu_possible_map to all ones

Initialising cpu_possible_map to all-ones with CONFIG_HOTPLUG_CPU means that

a) All for_each_cpu() loops will iterate across all NR_CPUS CPUs, rather
   than over possible ones.  That can be quite expensive.

b) Soon we'll be allocating per-cpu areas only for possible CPUs.  So with
   CPU_MASK_ALL, we'll be wasting memory.

I also switched voyager over to not use CPU_MASK_ALL in the non-CPU-hotplug
case.  Should be OK..

I note that parisc is also using CPU_MASK_ALL.  Suggest that it stop doing
that.

Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Paul Jackson <pj@sgi.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Zwane Mwaikambo <zwane@linuxpower.ca>
Cc: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Fix building external modules on ppc32
Andreas Gruenbacher [Fri, 10 Feb 2006 09:51:07 +0000 (01:51 -0800)]
[PATCH] Fix building external modules on ppc32

We are setting up sources for building external modules like this:

  /usr/src/linux-obj> # create a .config file
  /usr/src/linux-obj> make -C /usr/src/linux O=$PWD oldconfig
  /usr/src/linux-obj> make -C /usr/src/linux O=$PWD prepare
  /usr/src/linux-obj> make -C /usr/src/linux O=$PWD scripts
  /usr/src/linux-obj> make -C /usr/src/linux O=$PWD clean

After that, external modules can be built with:

  /usr/src/module> make -C /usr/src/linux-obj M=$PWD

This fails for ppc32 because the `make clean' removes the
arch/powerpc/include directory.  This should be done in archmrproper
instead of in archclean.

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] remove bogus comment from init/main.c
Heiko Carstens [Fri, 10 Feb 2006 09:51:06 +0000 (01:51 -0800)]
[PATCH] remove bogus comment from init/main.c

Remove bogus comment from init function which could lead to the assumption
that cpu_possible_map is setup in smp_prepare_cpus().

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] kexec: fix in free initrd when overlapped with crashkernel region
Haren Myneni [Fri, 10 Feb 2006 09:51:05 +0000 (01:51 -0800)]
[PATCH] kexec: fix in free initrd when overlapped with crashkernel region

It is possible that the reserved crashkernel region can be overlapped with
initrd since the bootloader sets the initrd location.  When the initrd
region is freed, the second kernel memory will not be contiguous.  The
Kexec_load can cause an oops since there is no contiguous memory to write
the second kernel or this memory could be used in the first kernel itself
and may not be part of the dump.  For example, on powerpc, the initrd is
located at 36MB and the crashkernel starts at 32MB.  The kexec_load caused
panic since writing into non-allocated memory (after 36MB).  We could see
the similar issue even on other archs.

One possibility is to move the initrd outside of crashkernel region.  But,
the initrd region will be freed anyway before the system is up.  This patch
fixes this issue and frees only regions that are not part of crashkernel
memory in case overlaps.

Signed-off-by: Haren Myneni <haren@us.ibm.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] wrong firmware location in IPW2100 Kconfig entry
Jesper Juhl [Fri, 10 Feb 2006 09:51:03 +0000 (01:51 -0800)]
[PATCH] wrong firmware location in IPW2100 Kconfig entry

Firmware should go into /lib/firmware, not /etc/firmware.

Found by Alejandro Bonilla.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sched: remove smpnice
Nick Piggin [Fri, 10 Feb 2006 09:51:02 +0000 (01:51 -0800)]
[PATCH] sched: remove smpnice

I don't think the code is quite ready, which is why I asked for Peter's
additions to also be merged before I acked it (although it turned out that
it still isn't quite ready with his additions either).

Basically I have had similar observations to Suresh in that it does not
play nicely with the rest of the balancing infrastructure (and raised
similar concerns in my review).

The samples (group of 4) I got for "maximum recorded imbalance" on a 2x2
SMP+HT Xeon are as follows:

            | Following boot | hackbench 20        | hackbench 40
 -----------+----------------+---------------------+---------------------
 2.6.16-rc2 | 30,37,100,112  | 5600,5530,6020,6090 | 6390,7090,8760,8470
 +nosmpnice |  3, 2,  4,  2  |   28, 150, 294, 132 |  348, 348, 294, 347

Hackbench raw performance is down around 15% with smpnice (but that in
itself isn't a huge deal because it is just a benchmark).  However, the
samples show that the imbalance passed into move_tasks is increased by
about a factor of 10-30.  I think this would also go some way to explaining
latency blips turning up in the balancing code (though I haven't actually
measured that).

We'll probably have to revert this in the SUSE kernel.

Cc: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Peter Williams <pwil3058@bigpond.net.au>
Cc: "Martin J. Bligh" <mbligh@aracnet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 10 Feb 2006 16:09:41 +0000 (08:09 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

18 years ago[BRIDGE]: fix error handling for add interface to bridge
Stephen Hemminger [Fri, 10 Feb 2006 01:10:12 +0000 (17:10 -0800)]
[BRIDGE]: fix error handling for add interface to bridge

Refactor how the bridge code interacts with kobject system.
It should still use kobjects even if not using sysfs.
Fix the error unwind handling in br_add_if.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[BRIDGE]: netfilter handle RCU during removal
Stephen Hemminger [Fri, 10 Feb 2006 01:09:38 +0000 (17:09 -0800)]
[BRIDGE]: netfilter handle RCU during removal

Bridge netfilter code needs to handle the case where device is
removed from bridge while packet in process. In these cases the
bridge_parent can become null while processing.

This should fix: http://bugzilla.kernel.org/show_bug.cgi?id=5803

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[BRIDGE]: fix for RCU and deadlock on device removal
Stephen Hemminger [Fri, 10 Feb 2006 01:08:52 +0000 (17:08 -0800)]
[BRIDGE]: fix for RCU and deadlock on device removal

Change Bridge receive path to correctly handle RCU removal of device
from bridge.  Also fixes deadlock between carrier_check and del_nbp.
This replaces the previous deleted flag fix.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 10 Feb 2006 01:08:09 +0000 (17:08 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

18 years ago[TCP]: rcvbuf lock when tcp_moderate_rcvbuf enabled
John Heffner [Fri, 10 Feb 2006 01:06:57 +0000 (17:06 -0800)]
[TCP]: rcvbuf lock when tcp_moderate_rcvbuf enabled

The rcvbuf lock should probably be honored here.

Signed-off-by: John Heffner <jheffner@psc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IRDA]: out of range array access
David Binderman [Fri, 10 Feb 2006 00:59:48 +0000 (16:59 -0800)]
[IRDA]: out of range array access

This patch fixes an out of range array access in irnet_irda.c.

Author: David Binderman <dcb314@hotmail.com>
Signed-off-by: Samuel Ortiz <samuel.ortiz@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IRDA]: Set proper IrLAP device address length
Samuel Ortiz [Fri, 10 Feb 2006 00:58:46 +0000 (16:58 -0800)]
[IRDA]: Set proper IrLAP device address length

This patch set IrDA's addr_len properly, i.e to 4 bytes, the size of the
IrLAP device address.

Signed-off-by: Samuel Ortiz <samuel.ortiz@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETLINK]: illegal use of pid in rtnetlink
Alexey Kuznetsov [Fri, 10 Feb 2006 00:40:58 +0000 (16:40 -0800)]
[NETLINK]: illegal use of pid in rtnetlink

When a netlink message is not related to a netlink socket,
it is issued by kernel socket with pid 0. Netlink "pid" has nothing
to do with current->pid. I called it incorrectly, if it was named "port",
the confusion would be avoided.

Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETLINK]: Fix a severe bug
Alexey Kuznetsov [Fri, 10 Feb 2006 00:40:11 +0000 (16:40 -0800)]
[NETLINK]: Fix a severe bug

netlink overrun was broken while improvement of netlink.
Destination socket is used in the place where it was meant to be source socket,
so that now overrun is never sent to user netlink sockets, when it should be,
and it even can be set on kernel socket, which results in complete deadlock
of rtnetlink.

Suggested fix is to restore status quo passing source socket as additional
argument to netlink_attachskb().

A little explanation: overrun is set on a socket, when it failed
to receive some message and sender of this messages does not or even
have no way to handle this error. This happens in two cases:
1. when kernel sends something. Kernel never retransmits and cannot
   wait for buffer space.
2. when user sends a broadcast and the message was not delivered
   to some recipients.

Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Fri, 10 Feb 2006 00:19:06 +0000 (16:19 -0800)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

18 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 10 Feb 2006 00:18:19 +0000 (16:18 -0800)]
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev

18 years ago[PATCH] do_sigaction: cleanup ->sa_mask manipulation
Oleg Nesterov [Thu, 9 Feb 2006 19:41:50 +0000 (22:41 +0300)]
[PATCH] do_sigaction: cleanup ->sa_mask manipulation

Clear unblockable signals beforehand.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sys_signal: initialize ->sa_mask
Oleg Nesterov [Thu, 9 Feb 2006 19:41:41 +0000 (22:41 +0300)]
[PATCH] sys_signal: initialize ->sa_mask

Pointed out by Linus Torvalds.

sys_signal() forgets to initialize ->sa_mask.

( I suspect arch/ia64/ia32/ia32_signal.c:sys32_signal()
  also needs this fix )

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[SPARC64]: Fix sys_newfstatat syscall table entry for 64-bit.
Heiko Carstens [Thu, 9 Feb 2006 23:09:15 +0000 (15:09 -0800)]
[SPARC64]: Fix sys_newfstatat syscall table entry for 64-bit.

The sparc64 64 bit syscall table seems to be broken as it has
compat_sys_newfstatat in its syscall table instead of sys_newfstatat.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoPull new-syscalls into release branch
Tony Luck [Thu, 9 Feb 2006 22:43:58 +0000 (14:43 -0800)]
Pull new-syscalls into release branch

18 years ago[IA64] mca_drv: Add minstate validation
Hidetoshi Seto [Thu, 9 Feb 2006 22:42:55 +0000 (14:42 -0800)]
[IA64] mca_drv: Add minstate validation

MCA driver can cause panic if kernel gets a state info with no minstate.
This patch adds minstate validation before handling it.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years ago[IA64] sys32_signal() forgets to initialize ->sa_mask
Tony Luck [Thu, 9 Feb 2006 22:41:41 +0000 (14:41 -0800)]
[IA64] sys32_signal() forgets to initialize ->sa_mask

Pointed out by Oleg Nesterov <oleg@tv-sign.ru>, who in turn
got the hint from Linus.

Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years ago[IA64-SGI] Small cleanup for misuse of list_for_each to list_for_each_safe.
Prarit Bhargava [Thu, 9 Feb 2006 22:14:52 +0000 (14:14 -0800)]
[IA64-SGI] Small cleanup for misuse of list_for_each to list_for_each_safe.

Patch was suggested by Kenneth W. Chen here

Signed-off-by: Prarit Bhargava <prarit@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years ago[IA64-SGI] Hotplug driver related fix in the SN ia64 code.
Prarit Bhargava [Thu, 9 Feb 2006 22:12:24 +0000 (14:12 -0800)]
[IA64-SGI] Hotplug driver related fix in the SN ia64 code.

Remove an erroneous kfree, and unlink the pcidev_info struct from the
pcidev_info list prior to free'ing the pcidev_info struct.

Signed-off-by: Prarit Bhargava <prarit@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years agoRevert "[PATCH] kconfig: detect if -lintl is needed when linking conf,mconf"
Linus Torvalds [Thu, 9 Feb 2006 16:00:14 +0000 (08:00 -0800)]
Revert "[PATCH] kconfig: detect if -lintl is needed when linking conf,mconf"

This reverts commit 5e375bc7d586e0df971734a5a5f1f080ffd89b68.

Kyle McMartin steps on his soap-box:

  "Sigh.  Can everyone please stop assuming gcc can output to /dev/null?
   On several platforms, ld tries to lseek in the output file, and fails
   if it can't."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'upstream-fixes'
Jeff Garzik [Thu, 9 Feb 2006 09:29:00 +0000 (04:29 -0500)]
Merge branch 'upstream-fixes'

18 years agoMerge branch 'master'
Jeff Garzik [Thu, 9 Feb 2006 05:58:59 +0000 (00:58 -0500)]
Merge branch 'master'

18 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Thu, 9 Feb 2006 01:06:51 +0000 (17:06 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

18 years ago[IPV6]: Address autoconfiguration does not work after device down/up cycle
Kristian Slavov [Thu, 9 Feb 2006 00:10:53 +0000 (16:10 -0800)]
[IPV6]: Address autoconfiguration does not work after device down/up cycle

If you set network interface down and up again, the IPv6 address
autoconfiguration does not work. 'ip addr' shows that the link-local
address is in tentative state. We don't even react to periodical router
advertisements.

During NETDEV_DOWN we clear IF_READY, and we don't set it back in
NETDEV_UP. While starting to perform DAD on the link-local address, we
notice that the device is not in IF_READY, and we abort autoconfiguration
process (which would eventually send router solicitations).

Acked-by: Juha-Matti Tapio <jmtapio@verkkotelakka.net>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[PATCH] x86-64: Add sys_unshare
Andi Kleen [Wed, 8 Feb 2006 23:35:50 +0000 (00:35 +0100)]
[PATCH] x86-64: Add sys_unshare

Add unshare syscall for x86-64

ppoll/pselect are not ready yet, but add reservations.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[IA64] unshare system call registration for ia64
Janak Desai [Wed, 8 Feb 2006 23:43:38 +0000 (15:43 -0800)]
[IA64] unshare system call registration for ia64

Registers system call for the ia64 architecture.

Reserves space for ppoll and pselect, and adds unshare at system
call number 1296.

Signed-off-by: Janak Desai <janak@us.ibm.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds [Wed, 8 Feb 2006 23:22:00 +0000 (15:22 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Wed, 8 Feb 2006 23:21:22 +0000 (15:21 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Wed, 8 Feb 2006 23:20:40 +0000 (15:20 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

Manual conflict merge of arch/arm/Kconfig

18 years ago[MMC] Remove extra character in AU1XXX MMC Kconfig entry
Jordan Crouse [Wed, 8 Feb 2006 22:23:05 +0000 (22:23 +0000)]
[MMC] Remove extra character in AU1XXX MMC Kconfig entry

An obvious vi fat finger on my part.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3278/1: OMAP: 3/3 Fix low-level io init for omap2 boards
Tony Lindgren [Wed, 8 Feb 2006 22:06:47 +0000 (22:06 +0000)]
[ARM] 3278/1: OMAP: 3/3 Fix low-level io init for omap2 boards

Patch from Tony Lindgren

This patch fixes the low-level IO init for omap2 boards.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3280/1: OMAP: 2/3 Fix low-level io init for omap1 boards
Tony Lindgren [Wed, 8 Feb 2006 22:06:46 +0000 (22:06 +0000)]
[ARM] 3280/1: OMAP: 2/3 Fix low-level io init for omap1 boards

Patch from Tony Lindgren

This patch fixes the low-level IO init for omap1 boards.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3279/1: OMAP: 1/3 Fix low-level io init
Tony Lindgren [Wed, 8 Feb 2006 22:06:45 +0000 (22:06 +0000)]
[ARM] 3279/1: OMAP: 1/3 Fix low-level io init

Patch from Tony Lindgren

This patch adds the missing cache flushes to common low-level
init that are needed to access the IO region. These flushes
are normally done at the end of devicemaps_init(), but we
need to detect the OMAP core type early.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3299/1: S3C24XX - fix irq range on adc device
Ben Dooks [Wed, 8 Feb 2006 22:03:31 +0000 (22:03 +0000)]
[ARM] 3299/1: S3C24XX - fix irq range on adc device

Patch from Ben Dooks

Change the IRQ resource range for the ADC device
to be two distinct IRQs

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[SERIAL] 8250_pci: add new PCI serial card support
Yoichi Yuasa [Wed, 8 Feb 2006 21:46:24 +0000 (21:46 +0000)]
[SERIAL] 8250_pci: add new PCI serial card support

This patch adds new PCI serial card support.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[SERIAL] ip22zilog: Whitespace cleanup.
Ralf Baechle [Wed, 8 Feb 2006 21:43:03 +0000 (21:43 +0000)]
[SERIAL] ip22zilog: Whitespace cleanup.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[SERIAL] PPC32 CPM_UART: update to utilize the new TTY flip API
Vitaly Bordug [Wed, 8 Feb 2006 21:40:13 +0000 (21:40 +0000)]
[SERIAL] PPC32 CPM_UART: update to utilize the new TTY flip API

This replaces old direct usage of tty->flip stuff with relative flip API
calls.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[SERIAL] Fix compile error in 8250_au1x00.c
Jordan Crouse [Wed, 8 Feb 2006 21:36:28 +0000 (21:36 +0000)]
[SERIAL] Fix compile error in 8250_au1x00.c

The DB1550 actually doesn't have a UART2.  Remove it from the list.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[SERIAL] 8250 serial console update uart_8250_port ier
Kumar Gala [Wed, 8 Feb 2006 21:34:35 +0000 (21:34 +0000)]
[SERIAL] 8250 serial console update uart_8250_port ier

On some embedded PowerPC (MPC834x) systems an extra byte would some
times be required to flush data out of the fifo.
serial8250_console_write() was updating the IER in hardware without
also updating the copy in uart_8250_port. This causes issues functions
like serial8250_start_tx() and __stop_tx() to misbehave.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3283/1: S3C2400 - defines the number of serial ports
Lucas Correia Villa Real [Wed, 8 Feb 2006 21:31:54 +0000 (21:31 +0000)]
[ARM] 3283/1: S3C2400 - defines the number of serial ports

Patch from Lucas Correia Villa Real

This patch defines the number of serial ports on the S3C2400.

Signed-off-by: Lucas Correia Villa Real <lucasvr@gobolinux.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3313/1: Use OSC4 instead of OSC1 for CLCD
Catalin Marinas [Wed, 8 Feb 2006 21:19:39 +0000 (21:19 +0000)]
[ARM] 3313/1: Use OSC4 instead of OSC1 for CLCD

Patch from Catalin Marinas

Because of a type, OSC1 was used for setting the display clock instead of
OSC4. This patch fixes it.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3311/1: clean up include/asm-arm/mutex.h
Nicolas Pitre [Wed, 8 Feb 2006 21:19:38 +0000 (21:19 +0000)]
[ARM] 3311/1: clean up include/asm-arm/mutex.h

Patch from Nicolas Pitre

Since:

if (unlikely(__res || __ex_flag))

produces worse code on ARM than:

if (unlikely(__res | __ex_flag))

I therefore made it more explicit:

__res |= __ex_flag;
if (unlikely(__res != 0))

so it is not seen as a typo again.

Also made everything static inline rather than macros for better readability
(both produce the same code after all).

And finally added missing \t from multi-line assembly code.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3310/1: add a comment about the possible __kuser_cmpxchg transient false
Nicolas Pitre [Wed, 8 Feb 2006 21:19:37 +0000 (21:19 +0000)]
[ARM] 3310/1: add a comment about the possible __kuser_cmpxchg transient false
 negative

Patch from Nicolas Pitre

The pre ARMv5 implementation can be aborted if an exception occurs in
the middle of it.  Because of that, the ARMv6 implementation doesn't
re-attempt the operation on a failed strex either.  Let's make this
transient nature of such a false positive more explicit in the
definition.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3309/1: disable the pre-ARMv5 NPTL kernel helper in the non MMU case
Nicolas Pitre [Wed, 8 Feb 2006 21:19:37 +0000 (21:19 +0000)]
[ARM] 3309/1: disable the pre-ARMv5 NPTL kernel helper in the non MMU case

Patch from Nicolas Pitre

The cmpxchg emulation on pre-ARMv5 relies on user code executed from a
kernel address.  If the operation cannot complete atomically, it is
aborted from the usr_entry macro by clearing the Z flag.  This clearing
of the Z flag is done whenever the user pc is above TASK_SIZE.

However this "pc >= TASK_SIZE" test cannot work in the non MMU case.
Worse: the current code will corrupt the Z flag on every entry to the
kernel.

Let's disable it in the non MMU case for now.  Using NPTL on non MMU
targets needs to be worked out anyway.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3308/1: old ABI compat: struct sockaddr_un
Nicolas Pitre [Wed, 8 Feb 2006 21:19:36 +0000 (21:19 +0000)]
[ARM] 3308/1: old ABI compat: struct sockaddr_un

Patch from Nicolas Pitre

struct sockaddr_un loses its padding with EABI.  Since the size of the
structure is used as a validation test in unix_mkname(), we need to
change the length argument to 110 whenever it is 112.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] Experimental config options should have (EXPERIMENTAL)
Russell King [Wed, 8 Feb 2006 21:09:55 +0000 (21:09 +0000)]
[ARM] Experimental config options should have (EXPERIMENTAL)

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3307/1: old ABI compat: mark it experimental
Nicolas Pitre [Wed, 8 Feb 2006 21:09:08 +0000 (21:09 +0000)]
[ARM] 3307/1: old ABI compat: mark it experimental

Patch from Nicolas Pitre

Although OABI_COMPAT works fine in most cases, it is still experimental
and could be for ever since it is nearly impossible to handle
everything, e.g. ioctls.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3306/1: S3C24XX - update defconfig
Ben Dooks [Wed, 8 Feb 2006 21:09:07 +0000 (21:09 +0000)]
[ARM] 3306/1: S3C24XX - update defconfig

Patch from Ben Dooks

Bring s3c2410 defconfig up to date

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3305/1: Minor typographical and spelling fixes in Konfig
Martin Michlmayr [Wed, 8 Feb 2006 21:09:07 +0000 (21:09 +0000)]
[ARM] 3305/1: Minor typographical and spelling fixes in Konfig

Patch from Martin Michlmayr

Minor typographical and spelling fixes in Konfig

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
---

 Kconfig |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3304/1: Add help descriptions to ARCH config items that don't have one
Martin Michlmayr [Wed, 8 Feb 2006 21:09:05 +0000 (21:09 +0000)]
[ARM] 3304/1: Add help descriptions to ARCH config items that don't have one

Patch from Martin Michlmayr

Add help descriptions to ARCH config items that don't have one.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
---

 Kconfig               |   32 ++++++++++++++++++++++++++++++--
 mach-clps711x/Kconfig |    2 ++
 2 files changed, 32 insertions(+), 2 deletions(-)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3303/1: S3C24XX - add clock enable usage counting
Ben Dooks [Wed, 8 Feb 2006 21:09:05 +0000 (21:09 +0000)]
[ARM] 3303/1: S3C24XX - add clock enable usage counting

Patch from Ben Dooks

Move to using an enable count for the shared clocks
and protect the clock system using a mutex instead
of just disabling IRQs during the clock update.

Since there is little more code in the path for
non-shared clocks, the enable and disable calls
use the same code for each.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3302/1: make pci=firmware the default for ixp2000
Lennert Buytenhek [Wed, 8 Feb 2006 21:09:04 +0000 (21:09 +0000)]
[ARM] 3302/1: make pci=firmware the default for ixp2000

Patch from Lennert Buytenhek

Most ixp2000 boards don't actually work if pci=firmware isn't used, so
the defconfig isn't really the right place to specify this.  Instead of
specifying it in the defconfigs, make the relevant board code take care
of setting pci=firmware.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3301/1: remove unnecessary clock default from ixdp2801 defconfig
Lennert Buytenhek [Wed, 8 Feb 2006 21:09:03 +0000 (21:09 +0000)]
[ARM] 3301/1: remove unnecessary clock default from ixdp2801 defconfig

Patch from Lennert Buytenhek

The ixdp2x01_clock is already 50MHz by default, so no need to
override it with 50MHz in the ixdp2801 defconfig as is done now,
which is confusing as well.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3300/1: make ixdp2x01 co-exist with other ixp2000 machine types
Lennert Buytenhek [Wed, 8 Feb 2006 21:09:02 +0000 (21:09 +0000)]
[ARM] 3300/1: make ixdp2x01 co-exist with other ixp2000 machine types

Patch from Lennert Buytenhek

The ixdp2x01 pci init call doesn't check whether it's really running
on an ixdp2x01, making it impossible to compile one kernel that works
on both the ixdp2x01 and another ixp2000 board.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[IA64] prevent sn2 specific code to be run in generic kernels
Jes Sorensen [Wed, 8 Feb 2006 15:19:28 +0000 (10:19 -0500)]
[IA64] prevent sn2 specific code to be run in generic kernels

Prevent SN2 specific code to be executed on non SN2 platforms when
running a generic kernel.

Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Wed, 8 Feb 2006 17:58:27 +0000 (09:58 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

18 years ago[MIPS] Add 'const' to readb and friends
Atsushi Nemoto [Wed, 8 Feb 2006 15:57:44 +0000 (00:57 +0900)]
[MIPS] Add 'const' to readb and friends

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

18 years ago[MIPS] Sparse: Add __user tags to syscall.c
Atsushi Nemoto [Wed, 8 Feb 2006 14:39:49 +0000 (23:39 +0900)]
[MIPS] Sparse: Add __user tags to syscall.c

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

18 years ago[MIPS] Wire up new syscalls.
Ralf Baechle [Wed, 8 Feb 2006 13:38:50 +0000 (13:38 +0000)]
[MIPS] Wire up new syscalls.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

18 years ago[MIPS] Make do_signal return void.
Ralf Baechle [Wed, 8 Feb 2006 13:38:18 +0000 (13:38 +0000)]
[MIPS] Make do_signal return void.

It's return value is ignored everywhere.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

18 years ago[MIPS] Add support for TIF_RESTORE_SIGMASK.
Ralf Baechle [Wed, 8 Feb 2006 12:58:41 +0000 (12:58 +0000)]
[MIPS] Add support for TIF_RESTORE_SIGMASK.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

18 years agoMerge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Linus Torvalds [Wed, 8 Feb 2006 16:06:09 +0000 (08:06 -0800)]
Merge branch 'for-linus2' of git://git./linux/kernel/git/viro/bird

18 years agoMerge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds [Wed, 8 Feb 2006 15:58:18 +0000 (07:58 -0800)]
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

18 years ago[PATCH] alpha: set cpu_possible_map much earlier
Ivan Kokshaysky [Wed, 8 Feb 2006 08:55:06 +0000 (11:55 +0300)]
[PATCH] alpha: set cpu_possible_map much earlier

All the percpu data structure walkers want cpu_possible_map to be
initialized early, but alpha instead populated "hwrpb_cpu_present_mask"
early in setup_smp(), and then initialized cpu_possible_map only much
later.

Thanks go to Heiko Carstens and Dipankar Sarma for noticing.

This fixes it and we can get rid of hwrpb_cpu_present_mask entirely.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] SLOB=y && SMP=y fix
Ingo Molnar [Wed, 8 Feb 2006 09:11:56 +0000 (10:11 +0100)]
[PATCH] SLOB=y && SMP=y fix

fix CONFIG_SLOB=y (when CONFIG_SMP=y): get rid of the 'align' parameter
from its __alloc_percpu() implementation. Boot-tested on x86.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] block: implement elv_insert and use it (fix ordcolor flipping bug)
Tejun Heo [Wed, 8 Feb 2006 09:01:31 +0000 (01:01 -0800)]
[PATCH] block: implement elv_insert and use it (fix ordcolor flipping bug)

q->ordcolor must only be flipped on initial queueing of a hardbarrier
request.

Constructing ordered sequence and requeueing used to pass through
__elv_add_request() which flips q->ordcolor when it sees a barrier
request.

This patch separates out elv_insert() from __elv_add_request() and uses
elv_insert() when constructing ordered sequence and requeueing.
elv_insert() inserts the given request at the specified position and
does nothing else.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoppc: fix up trivial Kconfig config selection
Linus Torvalds [Wed, 8 Feb 2006 15:51:17 +0000 (07:51 -0800)]
ppc: fix up trivial Kconfig config selection

Quoth BenH:
  "Ok, looks like I forgot to update the Kconfig for the new i2c driver,
   it should select I2C_POWERMAC instead.  Do you want a new patch or
   can you just fix it there ?"

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] blk: Fix SG_IO ioctl failure retry looping
Jens Axboe [Fri, 3 Feb 2006 07:37:08 +0000 (08:37 +0100)]
[PATCH] blk: Fix SG_IO ioctl failure retry looping

When issuing an SG_IO ioctl through sd that resulted in an unrecoverable
error, a nearly infinite retry loop was discovered. This is due to the
fact that the block layer SG_IO code is not setting up rq->retries. This
patch also fixes up the sg_scsi_ioctl path.

Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years ago[PATCH] sh: lvalues abuse in arch/sh/boards/renesas/rts7751r2d/io.c
Al Viro [Thu, 29 Dec 2005 16:45:52 +0000 (11:45 -0500)]
[PATCH] sh: lvalues abuse in arch/sh/boards/renesas/rts7751r2d/io.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] m32r_sio iomem annotations
Al Viro [Sat, 4 Feb 2006 01:15:52 +0000 (20:15 -0500)]
[PATCH] m32r_sio iomem annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] mark HISAX_AMD7930 as broken
Al Viro [Wed, 1 Feb 2006 11:45:37 +0000 (06:45 -0500)]
[PATCH] mark HISAX_AMD7930 as broken

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] type-safe min() in prism54
Al Viro [Wed, 1 Feb 2006 11:42:28 +0000 (06:42 -0500)]
[PATCH] type-safe min() in prism54

we do min() on u8 and small integer constant; cast the latter to u8.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] powerpc: Thermal control for dual core G5s
Benjamin Herrenschmidt [Wed, 8 Feb 2006 05:42:51 +0000 (16:42 +1100)]
[PATCH] powerpc: Thermal control for dual core G5s

This patch adds a windfarm module, windfarm_pm112, for the dual core G5s
(both 2 and 4 core models), keeping the machine from getting into
vacuum-cleaner mode ;) For proper credits, the patch was initially
written by Paul Mackerras, and slightly reworked by me to add overtemp
handling among others. The patch also removes the sysfs attributes from
windfarm_pm81 and windfarm_pm91 and instead adds code to the windfarm
core to automagically expose attributes for sensor & controls.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s390 __get_user() bogus warnings removal
Al Viro [Sat, 4 Feb 2006 01:11:52 +0000 (20:11 -0500)]
[PATCH] s390 __get_user() bogus warnings removal

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] synclink_gt is PCI-only
Al Viro [Wed, 1 Feb 2006 11:07:15 +0000 (06:07 -0500)]
[PATCH] synclink_gt is PCI-only

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] __user annotations in powerpc thread_info
Al Viro [Wed, 1 Feb 2006 12:29:34 +0000 (07:29 -0500)]
[PATCH] __user annotations in powerpc thread_info

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] fix iomem annotations in dart_iommu
Al Viro [Wed, 1 Feb 2006 12:28:02 +0000 (07:28 -0500)]
[PATCH] fix iomem annotations in dart_iommu

it's int __iomem *, not int * __iomem...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] s390 misc __user annotations
Al Viro [Wed, 1 Feb 2006 11:55:59 +0000 (06:55 -0500)]
[PATCH] s390 misc __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] compat_ioctl __user annotations
Al Viro [Wed, 1 Feb 2006 11:33:33 +0000 (06:33 -0500)]
[PATCH] compat_ioctl __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] sn3 iomem annotations and fixes
Al Viro [Wed, 1 Feb 2006 10:59:06 +0000 (05:59 -0500)]
[PATCH] sn3 iomem annotations and fixes

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] powerpc signal __user annotations
Al Viro [Wed, 1 Feb 2006 10:28:09 +0000 (05:28 -0500)]
[PATCH] powerpc signal __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] drivers/media/video __user annotations and fixes
Al Viro [Wed, 1 Feb 2006 10:24:20 +0000 (05:24 -0500)]
[PATCH] drivers/media/video __user annotations and fixes

* compat_alloc_user_space() returns __user pointer
* copying between two userland areas is copy_in_user(), not copy_from_user()
* dereferencing userland pointers is bad
* so's get_user() from local variables

... plus usual __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] powermac pci iomem annotations
Al Viro [Wed, 1 Feb 2006 10:18:43 +0000 (05:18 -0500)]
[PATCH] powermac pci iomem annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] s390x compat __user annotations
Al Viro [Wed, 1 Feb 2006 10:16:15 +0000 (05:16 -0500)]
[PATCH] s390x compat __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] mips: namespace pollution - mem_... -> __mem_... in io.h
Al Viro [Thu, 8 Dec 2005 04:12:54 +0000 (23:12 -0500)]
[PATCH] mips: namespace pollution - mem_... -> __mem_... in io.h

A pile of internal functions use only inside mips io.h has names starting
with mem_... and clashing with names in drivers; renamed to __mem_....

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years ago[PATCH] arm: fix dependencies for MTD_XIP
Al Viro [Mon, 19 Dec 2005 21:27:59 +0000 (16:27 -0500)]
[PATCH] arm: fix dependencies for MTD_XIP

MTD_XIP depends on having working asm/mtd-xip.h; it's not just per-architecture
(arm-only, as current Kconfig would have it), but actually per-subarch as
well.  Introduced a new symbol (ARCH_MTD_XIP) set by arch Kconfig; MTD_XIP
depends on it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Wed, 8 Feb 2006 04:34:29 +0000 (20:34 -0800)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

18 years ago[PATCH] powerpc: Fix sound driver use of i2c
Benjamin Herrenschmidt [Wed, 8 Feb 2006 04:04:18 +0000 (15:04 +1100)]
[PATCH] powerpc: Fix sound driver use of i2c

The PowerMac sound drivers used to rely on a "bug" of the i2c-keywest
driver that implemented I2C_SMBUS_BLOCK_DATA incorrectly, that is it did
what I2C_SMBUS_I2C_BLOCK_DATA should have done. The new i2c-powermac
driver that replaces keywest has this bug fixed, thus the sound drivers
must be fixed too.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Wed, 8 Feb 2006 04:32:13 +0000 (20:32 -0800)]
Merge git://git./linux/kernel/git/paulus/powerpc-merge

18 years ago[SPARC64]: Update defconfig.
David S. Miller [Wed, 8 Feb 2006 02:12:34 +0000 (18:12 -0800)]
[SPARC64]: Update defconfig.

Do not enable CONFIG_LOCALVERSION_AUTO by default.
When doing kernel development it just leaves a ton
of crap around.

Signed-off-by: David S. Miller <davem@davemloft.net>