aboutsummaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)AuthorFilesLines
2010-05-24Merge branch 'master' into develRussell King18-25/+41
2010-05-24Merge branch 'devel-stable' into develRussell King146-3791/+5701
2010-05-24Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King116-3664/+4784
devel-stable Conflicts: arch/arm/Kconfig
2010-05-24ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900wanzongshun3-0/+58
Add audio support part in arch/arm/mach-w90x900 Signed-off-by: Wan ZongShun<[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24x86: remove last traces of quicklist usagePeter Zijlstra1-1/+0
We still have a stray quicklist header included even though we axed quicklist usage quite a while back. Signed-off-by: Peter Zijlstra <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2010-05-24x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012Gabor Gombas1-0/+11
The low-memory corruption checker triggers during suspend/resume, so we need to reserve the low 64k. Don't be fooled that the BIOS identifies itself as "Dell Inc.", it's still Phoenix BIOS. [ hpa: I think we blacklist almost every BIOS in existence. We should either change this to a whitelist or just make it unconditional. ] Signed-off-by: Gabor Gombas <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]> Cc: <[email protected]>
2010-05-24x86: "nosmp" command line option should force the system into UP modeJan Beulich1-3/+23
Bits set in cpu_possible_mask prior to the execution of prefill_possible_map() (i.e. when parsing ACPI or MPS tables) would prevent the SMP alternatives logic from switching to UP mode, plus unnecessary setup of per-CPU data for CPUs that can never come online. Additionally, without CONFIG_HOTPLUG_CPU disabled CPUs can never come online, and hence setting cpu_possible_mask bits for them is again a simple waste of resources. Signed-off-by: Jan Beulich <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2010-05-24arch/x86/pci: use kasprintfJulia Lawall1-2/+1
kasprintf combines kmalloc and sprintf, and takes care of the size calculation itself. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression a,flag; expression list args; statement S; @@ a = - \(kmalloc\|kzalloc\)(...,flag) + kasprintf(flag,args) <... when != a if (a == NULL || ...) S ...> - sprintf(a,args); // </smpl> Signed-off-by: Julia Lawall <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2010-05-24x86, apic: ack all pending irqs when crashed/on kexecKerstin Jonsson1-8/+33
When the SMP kernel decides to crash_kexec() the local APICs may have pending interrupts in their vector tables. The setup routine for the local APIC has a deficient mechanism for clearing these interrupts, it only handles interrupts that has already been dispatched to the local core for servicing (the ISR register) safely, it doesn't consider lower prioritized queued interrupts stored in the IRR register. If you have more than one pending interrupt within the same 32 bit word in the LAPIC vector table registers you may find yourself entering the IO APIC setup with pending interrupts left in the LAPIC. This is a situation for wich the IO APIC setup is not prepared. Depending of what/which interrupt vector/vectors are stuck in the APIC tables your system may show various degrees of malfunctioning. That was the reason why the check_timer() failed in our system, the timer interrupts was blocked by pending interrupts from the old kernel when routed trough the IO APIC. Additional comment from Jiri Bohac: ============== If this should go into stable release, I'd add some kind of limit on the number of iterations, just to be safe from hard to debug lock-ups: +if (loops++ > MAX_LOOPS) { + printk("LAPIC pending clean-up") + break; +} while (queued); with MAX_LOOPS something like 1E9 this would leave plenty of time for the pending IRQs to be cleared and would and still cause at most a second of delay if the loop were to lock-up for whatever reason. [[email protected]: V2: Use tsc if avail to bail out after 1 sec due to possible virtual apic_read calls which may take rather long (suggested by: Avi Kivity <[email protected]>) If no tsc is available bail out quickly after cpu_khz, if we broke out too early and still have irqs pending (which should never happen?) we still get a WARN_ON... V3: - Fixed indentation -> checkpatch clean - max_loops must be signed V4: - Fix typo, mixed up tsc and ntsc in first rdtscll() call V5: Adjust WARN_ON() condition to also catch error in cpu_has_tsc case] Cc: <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: Kerstin Jonsson <[email protected]> Cc: Avi Kivity <[email protected]> Cc: Suresh Siddha <[email protected]> Tested-by: Eric W. Biederman <[email protected]> Signed-off-by: Thomas Renninger <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2010-05-24ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel ↵Alexander Holler2-0/+13
cmdline Add an option to force usage of the in-kernel cmdline even if the boot loader passes another command string to the kernel. Useful if someone cannot or don't want to change the command-line options of the boot loader but is able to change the kernel. Signed-off-by: Alexander Holler <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: 6140/1: silence a bogus sparse warning in unwind.cAlexander Shishkin1-0/+2
The check for compiler which is supposed to miscompile unwind tables clearly has nothing to do with sparse (which does not define necessary macros anyway), so simply silence it. Signed-off-by: Alexander Shishkin <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: mach-at91: duplicated includeAndrea Gelmini1-1/+0
arch/arm/mach-at91/board-sam9m10g45ek.c: mach/hardware.h is included more than once Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanupAndrea Gelmini1-1/+1
arch/arm/nwfpe/fpsr.h:33: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanupAndrea Gelmini1-4/+7
arch/arm/mach-shark/pci.c:19: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:20: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:21: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:24: WARNING: externs should be avoided in .c files arch/arm/mach-shark/pci.c:28: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanupAndrea Gelmini1-1/+1
arch/arm/nwfpe/ChangeLog:75: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanupAndrea Gelmini1-4/+4
arch/arm/mach-sa1100/leds.c:21: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:21: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:22: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:22: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:24: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:24: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanupAndrea Gelmini1-2/+2
arch/arm/mach-h720x/common.h:17: WARNING: space prohibited between function name and open parenthesis '(' arch/arm/mach-h720x/common.h:23: WARNING: space prohibited between function name and open parenthesis '(' Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanupAndrea Gelmini1-3/+3
arch/arm/mach-footbridge/ebsa285-pci.c:22: ERROR: switch and case should be at the same indent Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanupAndrea Gelmini1-2/+1
arch/arm/mach-clps711x/Makefile.boot:2: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanupAndrea Gelmini1-1/+1
arch/arm/boot/bootp/bootp.lds:22: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24ARM: SPEAR6xx: remove duplicated #includeHuang Weiyi1-1/+0
Remove duplicated #include('s) in arch/arm/mach-spear6xx/spear6xx.c Signed-off-by: Huang Weiyi <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-24powerpc/fsl-booke: Move the entry setup code into a seperate fileSebastian Andrzej Siewior2-198/+201
This patch only moves the initial entry code which setups the mapping from what ever to KERNELBASE into a seperate file. No code change has been made here. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2010-05-24powerpc/fsl-booke: fix the case where we are not in the first pageSebastian Andrzej Siewior1-0/+1
During boot we change the mapping a few times until we have a "defined" mapping. During this procedure a small 4KiB mapping is created and after that one a 64MiB. Currently the offset of the 4KiB page in that we run is zero because the complete startup up code is in first page which starts at RPN zero. If the code is recycled and moved to another location then its execution will fail because the start address in 64 MiB mapping is computed wrongly. It does not consider the offset to the page from the begin of the memory. This patch fixes this. Usually (system boot) r25 is zero so this does not change anything unless the code is recycled. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2010-05-24Merge branch 'for-linus' of ↵Linus Torvalds48-3241/+1938
git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (30 commits) Blackfin: SMP: fix continuation lines Blackfin: acvilon: fix timeout usage for I2C Blackfin: fix typo in BF537 IRQ comment Blackfin: unify duplicate MEM_MT48LC32M8A2_75 kconfig options Blackfin: set ARCH_KMALLOC_MINALIGN Blackfin: use atomic kmalloc in L1 alloc so it too can be atomic Blackfin: another year of changes (update copyright in boot log) Blackfin: optimize strncpy a bit Blackfin: isram: clean up ITEST_COMMAND macro and improve the selftests Blackfin: move string functions to normal lib/ assembly Blackfin: SIC: cut down on IAR MMR reads a bit Blackfin: bf537-minotaur: fix build errors due to header changes Blackfin: kgdb: pass up the CC register instead of a 0 stub Blackfin: handle HW errors in the new "FAULT" printing code Blackfin: show the whole accumulator in the pseudo DBG insn Blackfin: support all possible registers in the pseudo instructions Blackfin: add support for the DBG (debug output) pseudo insn Blackfin: change the BUG opcode to an unused 16-bit opcode Blackfin: allow NMI watchdog to be used w/RETN as a scratch reg Blackfin: add support for the DBGA (debug assert) pseudo insn ...
2010-05-24Merge branch 'bkl/ioctl' of ↵Linus Torvalds4-17/+23
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing * 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: uml: Pushdown the bkl from harddog_kern ioctl sunrpc: Pushdown the bkl from sunrpc cache ioctl sunrpc: Pushdown the bkl from ioctl autofs4: Pushdown the bkl from ioctl uml: Convert to unlocked_ioctls to remove implicit BKL ncpfs: BKL ioctl pushdown coda: Clean-up whitespace problems in pioctl.c coda: BKL ioctl pushdown drivers: Push down BKL into various drivers isdn: Push down BKL into ioctl functions scsi: Push down BKL into ioctl functions dvb: Push down BKL into ioctl functions smbfs: Push down BKL into ioctl function coda/psdev: Remove BKL from ioctl function um/mmapper: Remove BKL usage sn_hwperf: Kill BKL usage hfsplus: Push down BKL into ioctl function
2010-05-24Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds17-163/+507
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (25 commits) sh: fix up sh7785lcr_32bit_defconfig. arch/sh/lib/strlen.S: Checkpatch cleanup sh: fix up sh7786 dmaengine build. sh: guard cookie consistency across termination in the DMA driver sh: prevent the DMA driver from unloading, while in use sh: fix Oops in the serial SCI driver sh: allow platforms to specify SD-card supported voltages mmc: let MFD's provide supported Vdd card voltages to tmio_mmc sh: disable SD-card write-protection detection on kfr2r09 mfd: pass platform flags down to the tmio_mmc driver tmio: add a platform flag to disable card write-protection detection sh: Add SDHI DMA support to migor sh: Add SDHI DMA support to kfr2r09 sh: Add SDHI DMA support to ms7724se sh: Add SDHI DMA support to ecovec mmc: add DMA support to tmio_mmc driver, when used on SuperH sh: prepare the SDHI MFD driver to pass DMA configuration to tmio_mmc.c mmc: prepare tmio_mmc for passing of DMA configuration from the MFD cell sh: add DMA slave definitions to sh7724 sh: add DMA slaves for two SDHI controllers to sh7722 ...
2010-05-24arch/m68knommu/platform/68360/commproc.c: Checkpatch cleanupAndrea Gelmini1-2/+2
Checkpatch cleanup Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Greg Ungerer <[email protected]>
2010-05-24arch/m68knommu/mm/fault.c: Checkpatch cleanupAndrea Gelmini1-5/+5
arch/m68knommu/mm/fault.c:39: WARNING: space prohibited between function name and open parenthesis '(' arch/m68knommu/mm/fault.c:47: WARNING: braces {} are not necessary for any arm of this statement arch/m68knommu/mm/fault.c:51: ERROR: space required after that ',' (ctx:VxV) Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Greg Ungerer <[email protected]>
2010-05-24m68knommu: improve short help of m68knommu/Kconfig/RAMSIZE for '0' casePhilippe De Muyter1-1/+1
While it is explained in the long help text, meaning of '0' for RAMSIZE is easily overlooked because is not mentioned in the short help text. Add that. Signed-off-by: Philippe De Muyter <[email protected]> Signed-off-by: Greg Ungerer <[email protected]>
2010-05-24m68knommu: remove un-used mcfsmc.hGreg Ungerer1-187/+0
Remove the un-used mcfsmc.h. All ColdFire platforms that use SMC ethernet devices are platform enabled to use the smc91x driver. Signed-off-by: Greg Ungerer <[email protected]>
2010-05-24m68knommu: add smc91x support for ColdFire NETtel boardsGreg Ungerer2-1/+156
The ColdFire based NETtel boards use the SMC9196 ethernet devices. Switch to using a platform setup for these parts using the smc91x driver. The init code is taken strait out of arch/m68k/include/asm/mcfsmc.h, just cleaned up a bit. Signed-off-by: Greg Ungerer <[email protected]>
2010-05-24m68knommu: add smc91x support to ColdFire 5249 platformGreg Ungerer1-0/+48
The Freescale M5249EVB board is fitted with an SMC LAN91c11 ethernet device. Add platform support to the M5249EVB setup code to support this. Signed-off-by: Greg Ungerer <[email protected]>
2010-05-24m68knommu: remove size limit on non-MMU TASK_SIZEGreg Ungerer1-0/+4
The TASK_SIZE define is used in some places as a limit on the size of the virtual address space of a process. On non-MMU systems those addresses used in comparison will be physical addresses, and they could be anywhere in the 32bit physical address space. So for !CONFIG_MMU systems set the TASK_SIZE to the maximum physical address. Signed-off-by: Greg Ungerer <[email protected]>
2010-05-24sh: fix up sh7785lcr_32bit_defconfig.Paul Mundt1-109/+164
The build scripts inadvertently dropped this down to 29-bit, fix it back up. Reported-by: Raul Porcel <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-05-24arch/sh/lib/strlen.S: Checkpatch cleanupAndrea Gelmini1-1/+1
arch/sh/lib/strlen.S:38: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-05-23ARM: s3c6400_defconfig: Add NAND driverBen Dooks1-1/+83
Add the NAND driver to the list of inbuilt devices. Signed-of-by: Ben Dooks <[email protected]>
2010-05-23ARM: s3c6400_defconfig: enable sound as modulesBen Dooks1-2/+41
Add the ASoC/ALSA configuration for s3c6400_defconfig as modules Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: s3c6400_defconfig: enable power managementBen Dooks1-2/+12
Enable power management in the default build Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34Ben Dooks1-6/+18
Update the s5pv210_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34Ben Dooks1-6/+18
Update the s5pc110_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34Ben Dooks1-16/+28
Update the s5p6442_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34Ben Dooks1-17/+43
Update the s5p6440_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34Ben Dooks1-34/+47
Update the s3c6400_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34Ben Dooks1-317/+321
Update the s3c2410_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: s5pc100_defconfig: change ARCH_S5PC1XX to ARCH_S5PC100Ben Dooks1-1/+1
Fixup the defconfig post the latest moves, so ARCH_S5PC1XX becomes ARCH_S5PC100 which is sufficient to get the system building. Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: S5PC100: Fixup merge problemsBen Dooks4-15/+22
Between problems with Kconfig and merging commits from several different sources, it seems the s5pc100 build's move from plat-s5pc11 has had a few problems. Since I do not have the trees to rebuild this quickly, the easiest thing is to simply fix the errors found once the s5pc100_defconfig actually builds. Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: S5PC100: DMA: Add platform devices for PL330 DMACsJassi Brar4-0/+195
Samsung's Soc S5PC100 has three PL330 DMACs. First is dedicated for Memory->Memory data transfer while the other two meant for data transfer with peripherals. Define and add latter two PL330 DMACs as platform devices on the S5PC100 platform. Signed-off-by: Jassi Brar <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: S5PC100: Fix definition of IRQ_EINT()Ben Dooks1-0/+3
Somewhere during the latest platform cleanups the IRQ_EINT definition got broken, so fix it by replacing it in <mach/irqs.h> Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: SAMSUNG: fix suspend/resume on if some GPIO banks not presentPinkava J1-2/+6
When saving GPIOs during suspend/resume we need skip missing GPIO banks, not trying get corresponding chip again and again in infinite loop. Signed-off-by: Jiri Pinkava <[email protected]> [[email protected]: shorten subject] Signed-off-by: Ben Dooks <[email protected]>
2010-05-23ARM: Continue removing useless bootmem.h includesRussell King3-3/+0
Catch those which have been missed by 6262c92f because they were submitted via other routes. Signed-off-by: Russell King <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.