aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-08-04CRIS: Better handling of pinmux settingsJesper Nilsson1-2/+26
Depending on eth, eth_mido and geth fields in wr_hwprot, don't set corresponding pins on gpio port b to gpio mode. This avoids re-resetting the ethernet PHY should this already have been done. Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: New DMA defines for ARTPEC-3Jesper Nilsson1-0/+27
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: __do_strncpy_from_user: Don't read the byte beyond the nilJesper Nilsson1-4/+3
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Pagetable for ARTPEC-3Jesper Nilsson1-0/+8
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Machine dependent memmap.hJesper Nilsson2-24/+25
Move the old one to mach-fs and replace with a new one that only include the correct one for the machine architecture. Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Check if pointer is set before using itJesper Nilsson1-8/+12
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Machine dependent dma.hJesper Nilsson2-79/+80
Move the old one to mach-fs and replace with a new one that only include the correct one for the machine architecture. Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Define __read_mostly for CRISv32Jesper Nilsson1-0/+2
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Discard .note.gnu.build-id sectionJesper Nilsson1-1/+1
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Avoid compilation warning for putsJesper Nilsson1-40/+25
Rename to aputs. Also, simplify code by moving some common code out to macros. Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Add debug for assembler macrosJesper Nilsson1-0/+4
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Update for ARTPEC-3Jesper Nilsson1-5/+18
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Add more delays in DDR setupJesper Nilsson3-1/+21
Also, make DDR latency configurable. Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Add debug info for assembler codeJesper Nilsson1-0/+7
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Add debug info for assembler codeJesper Nilsson1-0/+3
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Add debug symbols for assembler codeJesper Nilsson1-0/+3
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Minor formatting fix in traps.cJesper Nilsson1-4/+2
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: v32: Correct auto-restart of syscallsJesper Nilsson1-1/+1
Register number was incorrect in syscalls that go via the restartblock (e.g, poll). Signed-off-by: Edgar Iglesias <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: More ARTPEC-3 support and i2c-boardinfo.Jesper Nilsson1-8/+66
Add standard i2d-devices. Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Remove obsolete pinmux.c, now machine dependent.Jesper Nilsson1-229/+0
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: kgdb: Fix compilation errorsJesper Nilsson1-8/+8
Paths were not correct and pack_hex_byte() takes two arguments. Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: v32: Correct path for intr_vect.hJesper Nilsson1-1/+1
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: v32: Better irq mapping codeJesper Nilsson1-25/+22
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: v32: Correct address for romfs in the imageJesper Nilsson1-1/+1
Is after __bss_start, not __vmlinux_end Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Additional mmu settings for ARTPEC-3Jesper Nilsson1-2/+40
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Faster syscall entry for CRISv32.Jesper Nilsson1-20/+17
Signed-off-by: Edgar Iglesias <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Simple insn reschedule to avoid interlocks.Jesper Nilsson1-9/+9
Brings down the CPI from ~1.5 to ~1.1. Signed-off-by: Edgar Iglesias <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Add debug for assembler functionsJesper Nilsson2-1/+29
Signed-off-by: Edgar Iglesias <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Correct address of the romfs in boot imageJesper Nilsson1-1/+1
The romfs should land after __init_end Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Fasttimer: Remove obsolete ifdefJesper Nilsson1-5/+1
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Better link to rs485 in helpJesper Nilsson1-1/+1
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: Remove CVS tag.Jesper Nilsson1-2/+1
Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: v10: remove all BKL usageJesper Nilsson1-26/+13
We don't need to take the BKL here. Also fixes compile error after last commit (smp_lock.h was not included) Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04CRIS: gpio: don't call copy_to_user()/copy_from_user() while holding spinlocksJesper Nilsson1-32/+48
copy_to_user()/copy_from_user() must not be used with spinlocks held. Move locks inside each case so we have better control of when the locks are held. Also, since we use spinlocks, we don't need to hold the BKL, so remove it. Reported-by: Kulikov Vasiliy <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04arch/cris: Remove unnecessary casts of private_dataJoe Perches1-5/+5
Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04cris: autoconvert trivial BKL users to private mutexJesper Nilsson4-12/+6
All these files use the big kernel lock in a trivial way to serialize their private file operations, typically resulting from an earlier semi-automatic pushdown from VFS. None of these drivers appears to want to lock against other code, and they all use the BKL as the top-level lock in their file operations, meaning that there is no lock-order inversion problem. Consequently, we can remove the BKL completely, replacing it with a per-file mutex in every case. Using a scripted approach means we can avoid typos. file=$1 name=$2 if grep -q lock_kernel ${file} ; then if grep -q 'include.*linux.mutex.h' ${file} ; then sed -i '/include.*<linux\/smp_lock.h>/d' ${file} else sed -i 's/include.*<linux\/smp_lock.h>.*$/include <linux\/mutex.h>/g' ${file} fi sed -i ${file} \ -e "/^#include.*linux.mutex.h/,$ { 1,/^\(static\|int\|long\)/ { /^\(static\|int\|long\)/istatic DEFINE_MUTEX(${name}_mutex); } }" \ -e "s/\(un\)*lock_kernel\>[ ]*()/mutex_\1lock(\&${name}_mutex)/g" \ -e '/[ ]*cycle_kernel_lock();/d' else sed -i -e '/include.*\<smp_lock.h\>/d' ${file} \ -e '/cycle_kernel_lock()/d' fi Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-04cris: Pushdown the bkl from ioctlJesper Nilsson7-61/+137
From: Frederic Weisbecker <[email protected]> Pushdown the bkl to the remaining drivers using the deprecated .ioctl. Signed-off-by: Frederic Weisbecker <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: John Kacur <[email protected]>
2010-08-04CRIS: invoke oom-killer from page faultJesper Nilsson1-4/+4
As explained in commit 1c0fe6e3bd, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Signed-off-by: Nick Piggin <[email protected]> Acked-by: David Rientjes <[email protected]> Signed-off-by: Jesper Nilsson <[email protected]> Signed-off-by: Mikael Starvik <[email protected]>
2010-08-04CRIS: GENERIC_TIME fixesJesper Nilsson4-106/+45
GENERIC_TIME was not functional for CRIS, giving random backward time jumps. For CRISv32 implement a new clocksource using the free running counter and ditch the arch_gettimeoffset. The random time jumps still existed, but turned out to be the write_seqlock which was missing around our do_timer() call. So switch over to GENERIC_TIME using the clocksource for CRISv32. CRISv10 doesn't have the free running counter needed for the clocksource trick, but we can still use GENERIC_TIME with arch_gettimeoffset. Unfortunately, there were problems in using the prescaler register to timer0 for the gettimeoffset calculation, so it is now ignored, making our resolution worse by the tune of 40usec (0.4%) worst case. At the same time, clean up some formatting and use NSEC_PER_SEC instead of 1000000000. Signed-off-by: Jesper Nilsson <[email protected]>
2010-08-049p: Pass the correct end of buffer to p9stat_readLatchesar Ionkov1-1/+1
Pass the correct end of the buffer to p9stat_read. Signed-off-by: Latchesar Ionkov <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2010-07-27gpio: fix spurious printk when freeing a gpioJon Povey1-3/+4
When freeing a gpio that has not been exported, gpio_unexport() prints a debug message when it should just fall through silently. Example spurious message: gpio_unexport: gpio0 status -22 Signed-off-by: Jon Povey <[email protected]> Cc: David Brownell <[email protected]> Acked-by: Uwe Kleine-K?nig <[email protected]> Cc: Gregory Bean <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-07-27edac: mpc85xx: fix coldplug/hotplug module autoloadingAnton Vorontsov1-0/+3
The MPC85xx EDAC driver is missing module device aliases, so the driver won't load automatically on boot. This patch fixes the issue by adding proper MODULE_DEVICE_TABLE() macros. Signed-off-by: Anton Vorontsov <[email protected]> Cc: Doug Thompson <[email protected]> Cc: Peter Tyser <[email protected]> Cc: Dave Jiang <[email protected]> Cc: Kumar Gala <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-07-27drivers/rtc/rtc-rx8581.c: fix setdatetimeRudolf Marek1-3/+17
Fix the logic while writing new date/time to the chip. The driver incorrectly wrote back register values to different registers and even with wrong mask. The patch adds clearing of the VLF register, which should be cleared if all date/time values are set. Signed-off-by: Rudolf Marek <[email protected]> Acked-by: Wan ZongShun <[email protected]> Cc: Martyn Welch <[email protected]> Cc: Alessandro Zummo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-07-27dynamic debug: move ddebug_remove_module() down into free_module()Jason Baron1-1/+3
The command echo "file ec.c +p" >/sys/kernel/debug/dynamic_debug/control causes an oops. Move the call to ddebug_remove_module() down into free_module(). In this way it should be called from all error paths. Currently, we are missing the remove if the module init routine fails. Signed-off-by: Jason Baron <[email protected]> Reported-by: Thomas Renninger <[email protected]> Tested-by: Thomas Renninger <[email protected]> Cc: <[email protected]> [2.6.32+] Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-07-27Merge branch 'urgent' of ↵Linus Torvalds1-3/+3
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf: perf, powerpc: Use perf_sample_data_init() for the FSL code
2010-07-27Merge git://git.infradead.org/users/cbou/battery-2.6.35Linus Torvalds1-15/+14
* git://git.infradead.org/users/cbou/battery-2.6.35: ds2782_battery: Rename get_current to fix build failure / name conflict
2010-07-27Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds19-36/+151
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: s2io: fixing DBG_PRINT() macro ath9k: fix dma direction for map/unmap in ath_rx_tasklet net: dev_forward_skb should call nf_reset net sched: fix race in mirred device removal tun: avoid BUG, dump packet on GSO errors bonding: set device in RLB ARP packet handler wimax/i2400m: Add PID & VID for Intel WiMAX 6250 ipv6: Don't add routes to ipv6 disabled interfaces. net: Fix skb_copy_expand() handling of ->csum_start net: Fix corruption of skb csum field in pskb_expand_head() of net/core/skbuff.c macvtap: Limit packet queue length ixgbe/igb: catch invalid VF settings bnx2x: Advance a module version bnx2x: Protect statistics ramrod and sequence number bnx2x: Protect a SM state change wireless: use netif_rx_ni in ieee80211_send_layer2_update
2010-07-27perf, powerpc: Use perf_sample_data_init() for the FSL codePeter Zijlstra1-3/+3
We should use perf_sample_data_init() to initialize struct perf_sample_data. As explained in the description of commit dc1d628a ("perf: Provide generic perf_sample_data initialization"), it is possible for userspace to get the kernel to dereference data.raw, so if it is not initialized, that means that unprivileged userspace can possibly oops the kernel. Using perf_sample_data_init makes sure it gets initialized to NULL. This conversion should have been included in commit dc1d628a, but it got missed. Signed-off-by: Peter Zijlstra <[email protected]> Acked-by: Kumar Gala <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
2010-07-26Merge branch 'x86-fixes-for-linus' of ↵Linus Torvalds2-11/+16
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Do not try to disable hpet if it hasn't been initialized before x86, i8259: Only register sysdev if we have a real 8259 PIC
2010-07-26s2io: fixing DBG_PRINT() macroBreno Leitao1-1/+1
Patch 9e39f7c5b311a306977c5471f9e2ce4c456aa038 changed the DBG_PRINT() macro and the if clause was wrongly changed. It means that currently all the DBG_PRINT are being printed, flooding the kernel log buffer with things like: s2io: eth6: Next block at: c0000000b9c90000 s2io: eth6: In Neterion Tx routine Signed-off-by: Breno Leitao <[email protected]> Acked-by: Sreenivasa Honnur <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.