aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-05-20m68knommu: switch to GPIO init macros in ColdFire 527x init codeGreg Ungerer1-572/+32
Modify the GPIO setup table to use the mcfgpio.h macros for table init. Simplifies code and reduces line count significantly. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Steven King <[email protected]>
2012-05-20m68knommu: switch to GPIO init macros in ColdFire 5272 init codeGreg Ungerer1-47/+3
Modify the GPIO setup table to use the mcfgpio.h macros for table init. Simplifies code and reduces line count significantly. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Steven King <[email protected]>
2012-05-20m68knommu: switch to GPIO init macros in ColdFire 5249 init codeGreg Ungerer1-31/+2
Modify the GPIO setup table to use the mcfgpio.h macros for table init. Simplifies code and reduces line count significantly. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Steven King <[email protected]>
2012-05-20m68knommu: switch to GPIO init macros in ColdFire 523x init codeGreg Ungerer1-250/+14
Modify the GPIO setup table to use the mcfgpio.h macros for table init. Simplifies code and reduces line count significantly. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Steven King <[email protected]>
2012-05-20m68knommu: switch to GPIO init macros in ColdFire 520x init codeGreg Ungerer1-141/+8
Modify the GPIO setup table to use the mcfgpio.h macros for table init. Simplifies code and reduces line count significantly. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Steven King <[email protected]>
2012-05-20m68knommu: switch to GPIO init macros in ColdFire 5206 init codeGreg Ungerer1-15/+1
Modify the GPIO setup table to use the mcfgpio.h macros for table init. Simplifies code and reduces line count significantly. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Steven King <[email protected]>
2012-05-20m68knommu: introduce macros to simplify ColdFire GPIO table initializationGreg Ungerer1-0/+54
We have very large tables in the ColdFire CPU GPIO setup code that essentially boil down to 2 distinct types of GPIO pin initiaization. Using 2 macros we can reduce these large tables to at most a dozen lines of setup code, and in quite a few cases a single table entry. Introduce these 2 macros into the existing mcfgpio.h header. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Steven King <[email protected]>
2012-05-20m68k: fix compiler warning by properly inlining flat_set_persistent()Ezequiel Garcia1-1/+6
This patch removes the following warning: fs/binfmt_flat.c:752: warning: unused variable 'persistent'. There is neither functionality change, nor extra code generated. Signed-off-by: Ezequiel Garcia <[email protected]> Signed-off-by: Greg Ungerer <[email protected]>
2012-05-20m68k: merge the MMU and non-MMU signal.c codeGreg Ungerer3-1882/+1199
The MMU (signal_mm.c) and non-MMU (signal_no.c) versions of the m68k architecture signal handling code are very similar. Most of their code is the same. Merge the two back into a single signal.c, and move some of the code around inside the file to minimize the number of #ifdefs required. Specificially we can group out the CONFIG_FPU and the CONFIG_MMU code. We end up needing a few other "#ifdef CONFIG_MMU" as well, but not too many. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]>
2012-05-20net/ipv4: replace simple_strtoul with kstrtoulEldad Zack3-3/+21
Replace simple_strtoul with kstrtoul in three similar occurrences, all setup handlers: * route.c: set_rhash_entries * tcp.c: set_thash_entries * udp.c: set_uhash_entries Also check if the conversion failed. Signed-off-by: Eldad Zack <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-20net/ipv4/ipconfig: neaten __setup placementEldad Zack1-3/+2
The __setup macro should follow the corresponding setup handler. Signed-off-by: Eldad Zack <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: drop unused inline functions in srmmu.cSam Ravnborg1-26/+0
When decelared inline the compiler does not warn about unused functions. But they are not used so drop them. Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: drop unused functions in pgtsrmmu.hSam Ravnborg2-52/+14
One function was only used by leon - move it to a leon specific file. Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32,leon: move leon mmu functions to leon_mm.cSam Ravnborg3-81/+85
We already have a leaon specific file - so keep all the laon stuff in one place. Signed-off-by: Sam Ravnborg <[email protected]> Cc: Konrad Eisele <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32,leon: remove duplicate definitions in leon.hSam Ravnborg1-15/+2
Signed-off-by: Sam Ravnborg <[email protected]> Cc: Konrad Eisele <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32,leon: remove duplicate UART register definitionsSam Ravnborg1-25/+0
The registers are defined in leon_amba too. Signed-off-by: Sam Ravnborg <[email protected]> Cc: Konrad Eisele <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32,leon: move leon ASI definitions to asi.hSam Ravnborg2-13/+14
Signed-off-by: Sam Ravnborg <[email protected]> Cc: Konrad Eisele <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: move trap table to a separate fileSam Ravnborg2-324/+419
Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc64: renamed ttable.S to ttable_64.SSam Ravnborg2-1/+1
To allow us to add ttable_32.S Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: Remove asm/sysen.h header.David S. Miller1-15/+0
Defines a sun4c register, thus completely unused. Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: Delete asm/smpprim.hDavid S. Miller1-54/+0
Completely unused. Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: Remove unused empty_bad_page{,_table} declarations.David S. Miller1-2/+0
Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: Kill boot_cpu_id4David S. Miller3-6/+1
It is written, but never actually read. Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: Move GET_PROCESSOR*_ID() out of asm/asmmacro.hDavid S. Miller2-10/+5
GET_PROCESSOR4D_ID is completely unused, so delete it. Move GET_PROCESSOR4M_ID to the sun4m specific trap code which uses it. We now no longer need to include asm/asi.h Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: Remove completely unused code from asm/cache.hDavid S. Miller1-114/+0
Signed-off-by: David S. Miller <[email protected]>
2012-05-19net: qmi_wwan: Add Vodafone/Huawei K5005 supportBjørn Mork1-0/+8
Tested-by: Thomas Schäfer <[email protected]> Signed-off-by: Bjørn Mork <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19net: cdc_ether: Add ZTE WWAN matches before generic EthernetAndrew Bird (Sphere Systems)1-0/+56
Some ZTE WWAN devices have generic CDC Ether descriptors. Add those into the whitelist so that we get FLAG_WWAN on the interface Signed-off-by: Andrew Bird <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19ipv6: use skb coalescing in reassemblyEric Dumazet1-6/+20
ip6_frag_reasm() can use skb_try_coalesce() to build optimized skb, reducing memory used by them (truesize), and reducing number of cache line misses and overhead for the consumer. Signed-off-by: Eric Dumazet <[email protected]> Cc: Alexander Duyck <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19ipv4: use skb coalescing in defragmentationEric Dumazet1-6/+20
ip_frag_reasm() can use skb_try_coalesce() to build optimized skb, reducing memory used by them (truesize), and reducing number of cache line misses and overhead for the consumer. Signed-off-by: Eric Dumazet <[email protected]> Cc: Alexander Duyck <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19net: introduce skb_try_coalesce()Eric Dumazet3-64/+94
Move tcp_try_coalesce() protocol independent part to skb_try_coalesce(). skb_try_coalesce() can be used in IPv4 defrag and IPv6 reassembly, to build optimized skbs (less sk_buff, and possibly less 'headers') skb_try_coalesce() is zero copy, unless the copy can fit in destination header (its a rare case) kfree_skb_partial() is also moved to net/core/skbuff.c and exported, because IPv6 will need it in patch (ipv6: use skb coalescing in reassembly). Signed-off-by: Eric Dumazet <[email protected]> Cc: Alexander Duyck <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19net:ipv6:fixed space issues relating to operators.Jeffrin Jose1-2/+2
Fixed space issues relating to operators found by checkpatch.pl tool in net/ipv6/udp.c Signed-off-by: Jeffrin Jose <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19net:ipv6:fixed a trailing white space issue.Jeffrin Jose1-1/+1
Fixed a trailing white space issue found by checkpatch.pl tool in net/ipv6/udp.c Signed-off-by: Jeffrin Jose <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19Merge tag 'parisc-fixes' of ↵Linus Torvalds3-19/+30
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 Pull PA-RISC fixes from James Bottomley: "This is a set of three bug fixes that gets parisc running again on systems with PA1.1 processors. Two fix regressions introduced in 2.6.39 and one fixes a prefetch bug that only affects PA7300LC processors. We also have another pending fix to do with the sectional arrangement of vmlinux.lds, but there's a query on it during testing on one particular system type, so I'll hold off sending it in for now." * tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] fix panic on prefetch(NULL) on PA7300LC [PARISC] fix crash in flush_icache_page_asm on PA1.1 [PARISC] fix PA1.1 oops on boot
2012-05-19Merge branch 'x86/ld-fix' of ↵Linus Torvalds7-65/+205
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 linker bug workarounds from Peter Anvin. GNU ld-2.22.52.0.[12] (*) has an unfortunate bug where it incorrectly turns certain relocation entries absolute. Section-relative symbols that are part of otherwise empty sections are silently changed them to absolute. We rely on section-relative symbols staying section-relative, and actually have several sections in the linker script solely for this purpose. See for example http://sourceware.org/bugzilla/show_bug.cgi?id=14052 We could just black-list the buggy linker, but it appears that it got shipped in at least F17, and possibly other distros too, so it's sadly not some rare unusual case. This backports the workaround from the x86/trampoline branch, and as Peter says: "This is not a minimal fix, not at all, but it is a tested code base." * 'x86/ld-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, relocs: When printing an error, say relative or absolute x86, relocs: Workaround for binutils 2.22.52.0.1 section bug x86, realmode: 16-bit real-mode code support for relocs tool (*) That's a manly release numbering system. Stupid, sure. But manly.
2012-05-19sparc32: Add ucmpdi2.o to obj-y instead of lib-y.David S. Miller1-2/+2
Otherwise if no references exist in the static kernel image, we won't export the symbol properly to modules. Signed-off-by: David S. Miller <[email protected]>
2012-05-19sparc32: add ucmpdi2Sam Ravnborg2-1/+20
Based on copy from microblaze add ucmpdi2 implementation. This fixes build of niu driver which failed with: drivers/built-in.o: In function `niu_get_nfc': niu.c:(.text+0x91494): undefined reference to `__ucmpdi2' This driver will never be used on a sparc32 system, but patch added to fix build breakage with all*config builds. Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-05-19Merge branch 'emev2' of ↵Olof Johansson14-0/+1458
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc * 'emev2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: mach-shmobile: Use DT_MACHINE for KZM9D V3 mach-shmobile: Emma Mobile EV2 DT support V3 mach-shmobile: KZM9D board Ethernet support V3 mach-shmobile: Emma Mobile EV2 GPIO support V3 mach-shmobile: Emma Mobile EV2 SMP support V3 mach-shmobile: KZM9D board support V3 mach-shmobile: Emma Mobile EV2 SoC base support V3 gpio: Emma Mobile GPIO driver V2
2012-05-19regulator: tps65910: use devm_* for memory allocationLaxman Dewangan1-18/+9
use the devm_* apis for memory allocation. Signed-off-by: Laxman Dewangan <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-05-19regulator: tps65910: use small letter for regulator namesLaxman Dewangan1-52/+52
Use the small-letter for names of different regulator to match the names with dt binding documents. Signed-off-by: Laxman Dewangan <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-05-19mfd: tpx6586x: Depend on regulatorMark Brown1-0/+1
Some of the OF binding stuff is done in the MFD. Signed-off-by: Mark Brown <[email protected]>
2012-05-19Merge branch 'for-linus' of git://git.kernel.dk/linux-blockLinus Torvalds9-30/+34
Pull block layer fixes from Jens Axboe: "A few small, but important fixes. Most of them are marked for stable as well - Fix failure to release a semaphore on error path in mtip32xx. - Fix crashable condition in bio_get_nr_vecs(). - Don't mark end-of-disk buffers as mapped, limit it to i_size. - Fix for build problem with CONFIG_BLOCK=n on arm at least. - Fix for a buffer overlow on UUID partition printing. - Trivial removal of unused variables in dac960." * 'for-linus' of git://git.kernel.dk/linux-block: block: fix buffer overflow when printing partition UUIDs Fix blkdev.h build errors when BLOCK=n bio allocation failure due to bio_get_nr_vecs() block: don't mark buffers beyond end of disk as mapped mtip32xx: release the semaphore on an error path dac960: Remove unused variables from DAC960_CreateProcEntries()
2012-05-19Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds1-2/+2
Pull one more networking bug-fix from David Miller: "One last straggler. Eric Dumazet's pktgen unload oops fix was not entirely complete, but all the cases should be handled properly now.... fingers crossed." * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: pktgen: fix module unload for good
2012-05-19memcg,thp: fix res_counter:96 regressionHugh Dickins1-1/+1
Occasionally, testing memcg's move_charge_at_immigrate on rc7 shows a flurry of hundreds of warnings at kernel/res_counter.c:96, where res_counter_uncharge_locked() does WARN_ON(counter->usage < val). The first trace of each flurry implicates __mem_cgroup_cancel_charge() of mc.precharge, and an audit of mc.precharge handling points to mem_cgroup_move_charge_pte_range()'s THP handling in commit 12724850e806 ("memcg: avoid THP split in task migration"). Checking !mc.precharge is good everywhere else, when a single page is to be charged; but here the "mc.precharge -= HPAGE_PMD_NR" likely to follow, is liable to result in underflow (a lot can change since the precharge was estimated). Simply check against HPAGE_PMD_NR: there's probably a better alternative, trying precharge for more, splitting if unsuccessful; but this one-liner is safer for now - no kernel/res_counter.c:96 warnings seen in 26 hours. Signed-off-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-05-19USB: EHCI: fix command register configuration lost problemMing Lei1-1/+0
The 3d9545cc375d117554a9b35dfddadf9189c62775(EHCI: maintain the ehci->command value properly) introducs one command register configuration lost problem by the below line in ehci_reset: ehci->command = ehci_readl(ehci, &ehci->regs->command); After writting RESET into command register, it is restored to its default value per EHCI spec[1], so the previous configuration will be lost, and may introduce some problems reported recently: - imx51 Babbage board detect usb hub failed[2], reported by Richard Zhao. - mouse and keyboard hangs in linux-next found by Dan Carpenter and Greg-KH. So this patch just removes the line to fix these problems, and keep configurating command register consistent as before the commit 3d9545cc(EHCI: maintain the ehci->command value properly). [1], 4.1 Host Controller Initialization of EHCI Specification 1.0 [2], failed dmesg log: usb 1-1: new high-speed USB device number 2 using mxc-ehci hub 1-1:1.0: USB hub found hub 1-1:1.0: 7 ports detected mxc-ehci mxc-ehci.1: fatal error mxc-ehci mxc-ehci.1: HC died; cleaning up mxc-ehci mxc-ehci.1: force halt; handshake f5780344 00004000 00004000 -> -110 mxc-ehci mxc-ehci.1: HC died; cleaning up usb 1-1: USB disconnect, device number 2 Reported-by: Richard Zhao <[email protected]> Reported-by: Dan Carpenter <[email protected]> Reported-by: Greg Kroah-Hartman <[email protected]> Cc: Chen Peter-B29397 <[email protected]> Acked-by: Alan Stern <[email protected]> Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-05-19Merge branch 'imx/pinctrl' into next/pinctrlOlof Johansson1-1/+1
* imx/pinctrl: mtd: nand: gpmi: fix compile error caused by pinctrl call
2012-05-19mtd: nand: gpmi: fix compile error caused by pinctrl callShawn Guo1-1/+1
Fix following compile error caused by commit 39febc0 (mtd: nand: gpmi: adopt pinctrl support). CC drivers/mtd/nand/gpmi-nand/gpmi-nand.o drivers/mtd/nand/gpmi-nand/gpmi-nand.c: In function ‘acquire_resources’: drivers/mtd/nand/gpmi-nand/gpmi-nand.c:499:45: error: ‘pdev’ undeclared (first use in this function) Reported-by: Subodh Nijsure <[email protected]> Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2012-05-19tracing: Remove kernel_lock annotationsRichard Weinberger1-2/+0
The BKL is gone, these annotations are useless. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Richard Weinberger <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
2012-05-19tracing: Fix initial buffer_size_kb stateVaibhav Nagarnaik1-1/+2
Make sure that the state of buffer_size_kb is initialized correctly and returns actual size of the ring buffer. Link: http://lkml.kernel.org/r/[email protected] Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Laurent Chavey <[email protected]> Cc: Justin Teravest <[email protected]> Cc: David Sharp <[email protected]> Signed-off-by: Vaibhav Nagarnaik <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
2012-05-19ring-buffer: Merge separate resize loopsVaibhav Nagarnaik1-26/+15
There are 2 separate loops to resize cpu buffers that are online and offline. Merge them to make the code look better. Also change the name from update_completion to update_done to allow shorter lines. Link: http://lkml.kernel.org/r/[email protected] Cc: Laurent Chavey <[email protected]> Cc: Justin Teravest <[email protected]> Cc: David Sharp <[email protected]> Signed-off-by: Vaibhav Nagarnaik <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
2012-05-19regulator: regulator for Palmas KconfigGraeme Gregory2-0/+13
Add the Kconfig/Makefile stuff for the palmas regulator driver Signed-off-by: Graeme Gregory <[email protected]> Signed-off-by: Mark Brown <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.