summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)AuthorFilesLines
2006-02-09Merge branch 'viro'Jeff Garzik145-1132/+891
2006-02-09Merge branch 'release' of ↵Linus Torvalds7-28/+70
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2006-02-09[PATCH] x86-64: Add sys_unshareAndi Kleen1-0/+3
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>
2006-02-09Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds28-55/+49
2006-02-09Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds30-70/+273
Manual conflict merge of arch/arm/Kconfig
2006-02-09[ARM] 3278/1: OMAP: 3/3 Fix low-level io init for omap2 boardsTony Lindgren2-2/+4
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>
2006-02-09[ARM] 3280/1: OMAP: 2/3 Fix low-level io init for omap1 boardsTony Lindgren9-9/+18
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>
2006-02-09[ARM] 3279/1: OMAP: 1/3 Fix low-level io initTony Lindgren2-17/+34
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>
2006-02-09[ARM] 3299/1: S3C24XX - fix irq range on adc deviceBen Dooks1-0/+5
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>
2006-02-09[ARM] 3313/1: Use OSC4 instead of OSC1 for CLCDCatalin Marinas1-1/+1
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>
2006-02-09[ARM] 3310/1: add a comment about the possible __kuser_cmpxchg transient falseNicolas Pitre1-1/+6
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>
2006-02-09[ARM] 3309/1: disable the pre-ARMv5 NPTL kernel helper in the non MMU caseNicolas Pitre1-0/+10
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>
2006-02-09[ARM] 3308/1: old ABI compat: struct sockaddr_unNicolas Pitre2-4/+75
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>
2006-02-09[ARM] Experimental config options should have (EXPERIMENTAL)Russell King1-1/+1
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2006-02-09[ARM] 3307/1: old ABI compat: mark it experimentalNicolas Pitre1-1/+1
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>
2006-02-09[ARM] 3306/1: S3C24XX - update defconfigBen Dooks1-13/+38
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>
2006-02-09[ARM] 3305/1: Minor typographical and spelling fixes in KonfigMartin Michlmayr1-4/+4
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>
2006-02-09[ARM] 3304/1: Add help descriptions to ARCH config items that don't have oneMartin Michlmayr2-2/+32
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>
2006-02-09[ARM] 3303/1: S3C24XX - add clock enable usage countingBen Dooks2-10/+34
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>
2006-02-09[ARM] 3302/1: make pci=firmware the default for ixp2000Lennert Buytenhek7-4/+7
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>
2006-02-09[ARM] 3301/1: remove unnecessary clock default from ixdp2801 defconfigLennert Buytenhek1-1/+1
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>
2006-02-09[ARM] 3300/1: make ixdp2x01 co-exist with other ixp2000 machine typesLennert Buytenhek1-1/+3
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>
2006-02-08[IA64] prevent sn2 specific code to be run in generic kernelsJes Sorensen2-3/+7
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>
2006-02-08Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds9-68/+153
2006-02-08[MIPS] Sparse: Add __user tags to syscall.cAtsushi Nemoto1-22/+26
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---
2006-02-08[MIPS] Wire up new syscalls.Ralf Baechle4-0/+68
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---
2006-02-08[MIPS] Make do_signal return void.Ralf Baechle2-6/+5
It's return value is ignored everywhere. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---
2006-02-08[MIPS] Add support for TIF_RESTORE_SIGMASK.Ralf Baechle4-44/+58
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---
2006-02-08Merge branch 'for-linus2' of ↵Linus Torvalds9-116/+121
git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
2006-02-08[PATCH] alpha: set cpu_possible_map much earlierIvan Kokshaysky1-21/+4
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>
2006-02-08[PATCH] sh: lvalues abuse in arch/sh/boards/renesas/rts7751r2d/io.cAl Viro1-12/+18
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] fix iomem annotations in dart_iommuAl Viro1-1/+1
it's int __iomem *, not int * __iomem... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] s390 misc __user annotationsAl Viro2-3/+3
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] powerpc signal __user annotationsAl Viro2-13/+9
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] powermac pci iomem annotationsAl Viro1-46/+43
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] s390x compat __user annotationsAl Viro1-41/+42
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] arm: fix dependencies for MTD_XIPAl Viro1-0/+5
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>
2006-02-08Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds6-36/+10
2006-02-08Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds21-62/+86
2006-02-08[SPARC64]: Update defconfig.David S. Miller1-2/+3
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>
2006-02-08[SPARC]: Wire up sys_unshare().David S. Miller5-34/+7
Also, the Solaris syscall table is sized differrently, and does not go beyond entry 255, so trim off the excess entries. Signed-off-by: David S. Miller <davem@davemloft.net>
2006-02-08[PATCH] arch/x86_64/pci/mmconfig.c NULL noise removalAl Viro1-1/+1
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] amd64 time.c __iomem annotationsAl Viro1-1/+1
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] bogus extern in low_i2c.cAl Viro1-2/+1
extern in function definition is an odd thing.. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] eeh_driver NULL noise removalAl Viro1-4/+4
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] cmm NULL noise removal, __user annotationsAl Viro1-5/+5
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] fallout from ptrace consolidation patch: cris/arch-v10Al Viro1-4/+4
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] ppc: last_task_.... is defined only on non-SMPAl Viro1-0/+4
... so it should be exported only on non-SMP. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] restore power-off on sparc32Al Viro1-1/+1
Damn you, Eric Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2006-02-08[PATCH] fix breakage in ocp.cAl Viro1-2/+2
it's ocp_device_...., not ocp_driver_.... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
generated by cgit v1.2.3 (git 2.39.0) at 2025-01-24 03:35:08 +0300