path: root/arch/score
AgeCommit message (Collapse)AuthorFilesLines
2015-06-10score: Fix exception handler labelGuenter Roeck1-1/+1
The latest version of modinfo fails to compile score architecture targets with the following error. FATAL: The relocation at __ex_table+0x634 references section "__ex_table" which is not executable, IOW the kernel will fault if it ever tries to jump to it. Something is seriously wrong and should be fixed. The probem is caused by a bad label in an __ex_table entry. Acked-by: Lennox Wu <> Cc: Quentin Casasnovas <> Signed-off-by: Guenter Roeck <>
2015-04-12arch: Remove exec_domain from remaining archsRichard Weinberger2-3/+0
Signed-off-by: Richard Weinberger <>
2015-02-12all arches, signal: move restart_block to struct task_structAndy Lutomirski3-6/+1
If an attacker can cause a controlled kernel stack overflow, overwriting the restart block is a very juicy exploit target. This is because the restart_block is held in the same memory allocation as the kernel stack. Moving the restart block to struct task_struct prevents this exploit by making the restart_block harder to locate. Note that there are other fields in thread_info that are also easy targets, at least on some architectures. It's also a decent simplification, since the restart code is more or less identical on all architectures. [ metag: align thread_info::supervisor_stack] Signed-off-by: Andy Lutomirski <> Cc: Thomas Gleixner <> Cc: Al Viro <> Cc: "H. Peter Anvin" <> Cc: Ingo Molnar <> Cc: Kees Cook <> Cc: David Miller <> Acked-by: Richard Weinberger <> Cc: Richard Henderson <> Cc: Ivan Kokshaysky <> Cc: Matt Turner <> Cc: Vineet Gupta <> Cc: Russell King <> Cc: Catalin Marinas <> Cc: Will Deacon <> Cc: Haavard Skinnemoen <> Cc: Hans-Christian Egtvedt <> Cc: Steven Miao <> Cc: Mark Salter <> Cc: Aurelien Jacquiot <> Cc: Mikael Starvik <> Cc: Jesper Nilsson <> Cc: David Howells <> Cc: Richard Kuo <> Cc: "Luck, Tony" <> Cc: Geert Uytterhoeven <> Cc: Michal Simek <> Cc: Ralf Baechle <> Cc: Jonas Bonn <> Cc: "James E.J. Bottomley" <> Cc: Helge Deller <> Cc: Benjamin Herrenschmidt <> Cc: Paul Mackerras <> Acked-by: Michael Ellerman <> (powerpc) Tested-by: Michael Ellerman <> (powerpc) Cc: Martin Schwidefsky <> Cc: Heiko Carstens <> Cc: Chen Liqin <> Cc: Lennox Wu <> Cc: Chris Metcalf <> Cc: Guan Xuetao <> Cc: Chris Zankel <> Cc: Max Filippov <> Cc: Oleg Nesterov <> Cc: Guenter Roeck <> Signed-off-by: James Hogan <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2015-02-11mm: make FIRST_USER_ADDRESS unsigned long on all archsKirill A. Shutemov1-1/+1
LKP has triggered a compiler warning after my recent patch "mm: account pmd page tables to the process": mm/mmap.c: In function 'exit_mmap': >> mm/mmap.c:2857:2: warning: right shift count >= width of type [enabled by default] The code: > 2857 WARN_ON(mm_nr_pmds(mm) > 2858 round_up(FIRST_USER_ADDRESS, PUD_SIZE) >> PUD_SHIFT); In this, on tile, we have FIRST_USER_ADDRESS defined as 0. round_up() has the same type -- int. PUD_SHIFT. I think the best way to fix it is to define FIRST_USER_ADDRESS as unsigned long. On every arch for consistency. Signed-off-by: Kirill A. Shutemov <> Reported-by: Wu Fengguang <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2015-02-10score: drop _PAGE_FILE and pte_file()-related helpersKirill A. Shutemov2-17/+2
We've replaced remap_file_pages(2) implementation with emulation. Nobody creates non-linear mapping anymore. This patch also increase number of bits availble for swap offset. Signed-off-by: Kirill A. Shutemov <> Cc: Chen Liqin <> Cc: Lennox Wu <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2015-01-29vm: add VM_FAULT_SIGSEGV handling supportLinus Torvalds1-0/+2
The core VM already knows about VM_FAULT_SIGBUS, but cannot return a "you should SIGSEGV" error, because the SIGSEGV case was generally handled by the caller - usually the architecture fault handler. That results in lots of duplication - all the architecture fault handlers end up doing very similar "look up vma, check permissions, do retries etc" - but it generally works. However, there are cases where the VM actually wants to SIGSEGV, and applications _expect_ SIGSEGV. In particular, when accessing the stack guard page, libsigsegv expects a SIGSEGV. And it usually got one, because the stack growth is handled by that duplicated architecture fault handler. However, when the generic VM layer started propagating the error return from the stack expansion in commit fee7e49d4514 ("mm: propagate error from stack expansion even for guard page"), that now exposed the existing VM_FAULT_SIGBUS result to user space. And user space really expected SIGSEGV, not SIGBUS. To fix that case, we need to add a VM_FAULT_SIGSEGV, and teach all those duplicate architecture fault handlers about it. They all already have the code to handle SIGSEGV, so it's about just tying that new return value to the existing code, but it's all a bit annoying. This is the mindless minimal patch to do this. A more extensive patch would be to try to gather up the mostly shared fault handling logic into one generic helper routine, and long-term we really should do that cleanup. Just from this patch, you can generally see that most architectures just copied (directly or indirectly) the old x86 way of doing things, but in the meantime that original x86 model has been improved to hold the VM semaphore for shorter times etc and to handle VM_FAULT_RETRY and other "newer" things, so it would be a good idea to bring all those improvements to the generic case and teach other architectures about them too. Reported-and-tested-by: Takashi Iwai <> Tested-by: Jan Engelhardt <> Acked-by: Heiko Carstens <> # "s390 still compiles and boots" Cc: Cc: Signed-off-by: Linus Torvalds <>
2014-12-10net, lib: kill arch_fast_hash library bitsDaniel Borkmann1-1/+0
As there are now no remaining users of arch_fast_hash(), lets kill it entirely. This basically reverts commit 71ae8aac3e19 ("lib: introduce arch optimized hash library") and follow-up work, that is f.e., commit 237217546d44 ("lib: hash: follow-up fixups for arch hash"), commit e3fec2f74f7f ("lib: Add missing arch generic-y entries for asm-generic/hash.h") and last but not least commit 6a02652df511 ("perf tools: Fix include for non x86 architectures"). Cc: Francesco Fusco <> Cc: Thomas Graf <> Cc: Arnaldo Carvalho de Melo <> Signed-off-by: Daniel Borkmann <> Signed-off-by: David S. Miller <>
2014-10-09score: use Kbuild logic to include <asm-generic/sections.h>Geert Uytterhoeven2-6/+1
Signed-off-by: Geert Uytterhoeven <> Acked-by: Lennox Wu <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-10-09Merge branch 'timers-nohz-for-linus' of ↵Linus Torvalds1-0/+1
git:// Pull timer fixes from Ingo Molnar: "Main changes: - Fix the deadlock reported by Dave Jones et al - Clean up and fix nohz_full interaction with arch abilities - nohz init code consolidation/cleanup" * 'timers-nohz-for-linus' of git:// nohz: nohz full depends on irq work self IPI support nohz: Consolidate nohz full init code arm64: Tell irq work about self IPI support arm: Tell irq work about self IPI support x86: Tell irq work about self IPI support irq_work: Force raised irq work to run on irq work interrupt irq_work: Introduce arch_irq_work_has_interrupt() nohz: Move nohz full init call to tick init
2014-10-05score: Remove GENERIC_HAS_IOMAPRichard Weinberger1-3/+0
The symbol is an orphan, get rid of it. Signed-off-by: Richard Weinberger <> Acked-by: Lennox Wu <> Cc: Paul Bolle <> [Guenter Roeck: Merge with 3.17-rc3; update headline] Signed-off-by: Guenter Roeck <>
2014-10-05arch/score/include/asm/Kbuild: Add generic "serial.h"Chen Gang1-0/+1
The related error (with allmodconfig under score): CC [M] drivers/staging/speakup/speakup_acntpc.o In file included from drivers/staging/speakup/speakup_acntpc.c:33:0: drivers/staging/speakup/serialio.h:7:24: fatal error: asm/serial.h: No such file or directory #include <asm/serial.h> ^ compilation terminated. make[3]: *** [drivers/staging/speakup/speakup_acntpc.o] Error 1 make[2]: *** [drivers/staging/speakup] Error 2 make[1]: *** [drivers/staging] Error 2 make: *** [drivers] Error 2 Acked-by: Lennox Wu <> Signed-off-by: Chen Gang <>
2014-10-05score: remove deprecated IRQF_DISABLEDMichael Opdenacker1-1/+1
This patch removes the use of the IRQF_DISABLED flag from arch/score/kernel/time.c It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <> Acked-by: Lennox Wu <>
2014-10-05arch/score/mm/cache.c: Export 'flush_icache_range'Chen Gang1-0/+1
The related error (with allmodconfig under score): MODPOST 1365 modules ERROR: "flush_icache_range" [drivers/misc/lkdtm.ko] undefined! Acked-by: Lennox Wu <> Signed-off-by: Chen Gang <>
2014-10-05arch: score: Export necessary symbols in related filesChen Gang2-0/+2
'csum_partial_copy_from_user' and 'flush_dcache_page' are also needed by outside modules, so need export them in the related files. The related error (with allmodconfig under score): MODPOST 1365 modules ERROR: "csum_partial_copy_from_user" [net/rxrpc/af-rxrpc.ko] undefined! ERROR: "flush_dcache_page" [net/sunrpc/sunrpc.ko] undefined! Acked-by: Lennox Wu <> Signed-off-by: Chen Gang <>
2014-09-13irq_work: Introduce arch_irq_work_has_interrupt()Peter Zijlstra1-0/+1
The nohz full code needs irq work to trigger its own interrupt so that the subsystem can work even when the tick is stopped. Lets introduce arch_irq_work_has_interrupt() that archs can override to tell about their support for this ability. Signed-off-by: Peter Zijlstra <> Cc: Ingo Molnar <> Cc: Paul E. McKenney <> Cc: Peter Zijlstra <> Cc: Thomas Gleixner <> Signed-off-by: Frederic Weisbecker <>
2014-08-09Merge branch 'signal-cleanup' of ↵Linus Torvalds1-25/+18
git:// Pull arch signal handling cleanup from Richard Weinberger: "This patch series moves all remaining archs to the get_signal(), signal_setup_done() and sigsp() functions. Currently these archs use open coded variants of the said functions. Further, unused parameters get removed from get_signal_to_deliver(), tracehook_signal_handler() and signal_delivered(). At the end of the day we save around 500 lines of code." * 'signal-cleanup' of git:// (43 commits) powerpc: Use sigsp() openrisc: Use sigsp() mn10300: Use sigsp() mips: Use sigsp() microblaze: Use sigsp() metag: Use sigsp() m68k: Use sigsp() m32r: Use sigsp() hexagon: Use sigsp() frv: Use sigsp() cris: Use sigsp() c6x: Use sigsp() blackfin: Use sigsp() avr32: Use sigsp() arm64: Use sigsp() arc: Use sigsp() sas_ss_flags: Remove nested ternary if Rip out get_signal_to_deliver() Clean up signal_delivered() tracehook_signal_handler: Remove sig, info, ka and regs ...
2014-08-08lib/scatterlist: clean up useless architecture versions of scatterlist.hLaura Abbott2-6/+1
There's no need to have an architecture version of scatterlist.h if the only thing the file does is include asm-generic/scatterlist.h. Switch to the asm-generic versions directly. Acked-by: Jesper Nilsson <> Acked-by: David Howells <> Signed-off-by: Laura Abbott <> Cc: Lennox Wu <> Cc: Chen Liqin <>, Cc: Koichi Yasutake <> Cc: Michal Simek <> Cc: Hirokazu Takata <> Cc: Mikael Starvik <> Cc: Thomas Gleixner <> Cc: Benjamin Herrenschmidt <> Cc: Heiko Carstens <> Cc: Russell King <> Cc: Tony Luck <> Cc: Fenghua Yu <> Cc: Paul Mackerras <> Cc: Ingo Molnar <> Cc: "H. Peter Anvin" <> Cc: "James E.J. Bottomley" <> Cc: Martin Schwidefsky <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-08-06score, ptrace: remove unused macrosChen Gang1-11/+0
'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules. At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score): CC [M] drivers/md/raid1.o In file included from drivers/md/raid1.c:42:0: drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX) ^ In file included from ./arch/score/include/asm/ptrace.h:4:0, from include/linux/sched.h:31, from include/linux/blkdev.h:4, from drivers/md/raid1.c:36: ./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition #define COUNTER 38 Signed-off-by: Chen Gang <> Signed-off-by: David Rientjes <> Cc: Lennox Wu <> Cc: Guenter Roeck <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-08-06score: Use get_signal() signal_setup_done()Richard Weinberger1-25/+18
Use the more generic functions get_signal() signal_setup_done() for signal delivery. Acked-by: Lennox Wu <> Signed-off-by: Richard Weinberger <>
2014-07-17arch, locking: Ciao arch_mutex_cpu_relax()Davidlohr Bueso1-0/+1
The arch_mutex_cpu_relax() function, introduced by 34b133f, is hacky and ugly. It was added a few years ago to address the fact that common cpu_relax() calls include yielding on s390, and thus impact the optimistic spinning functionality of mutexes. Nowadays we use this function well beyond mutexes: rwsem, qrwlock, mcs and lockref. Since the macro that defines the call is in the mutex header, any users must include mutex.h and the naming is misleading as well. This patch (i) renames the call to cpu_relax_lowlatency ("relax, but only if you can do it with very low latency") and (ii) defines it in each arch's asm/processor.h local header, just like for regular cpu_relax functions. On all archs, except s390, cpu_relax_lowlatency is simply cpu_relax, and thus we can take it out of mutex.h. While this can seem redundant, I believe it is a good choice as it allows us to move out arch specific logic from generic locking primitives and enables future(?) archs to transparently define it, similarly to System Z. Signed-off-by: Davidlohr Bueso <> Signed-off-by: Peter Zijlstra <> Cc: Andrew Morton <> Cc: Anton Blanchard <> Cc: Aurelien Jacquiot <> Cc: Benjamin Herrenschmidt <> Cc: Bharat Bhushan <> Cc: Catalin Marinas <> Cc: Chen Liqin <> Cc: Chris Metcalf <> Cc: Christian Borntraeger <> Cc: Chris Zankel <> Cc: David Howells <> Cc: David S. Miller <> Cc: Deepthi Dharwar <> Cc: Dominik Dingel <> Cc: Fenghua Yu <> Cc: Geert Uytterhoeven <> Cc: Guan Xuetao <> Cc: Haavard Skinnemoen <> Cc: Hans-Christian Egtvedt <> Cc: Heiko Carstens <> Cc: Helge Deller <> Cc: Hirokazu Takata <> Cc: Ivan Kokshaysky <> Cc: James E.J. Bottomley <> Cc: James Hogan <> Cc: Jason Wang <> Cc: Jesper Nilsson <> Cc: Joe Perches <> Cc: Jonas Bonn <> Cc: Joseph Myers <> Cc: Kees Cook <> Cc: Koichi Yasutake <> Cc: Lennox Wu <> Cc: Linus Torvalds <> Cc: Mark Salter <> Cc: Martin Schwidefsky <> Cc: Matt Turner <> Cc: Max Filippov <> Cc: Michael Neuling <> Cc: Michal Simek <> Cc: Mikael Starvik <> Cc: Nicolas Pitre <> Cc: Paolo Bonzini <> Cc: Paul Burton <> Cc: Paul E. McKenney <> Cc: Paul Gortmaker <> Cc: Paul Mackerras <> Cc: Qais Yousef <> Cc: Qiaowei Ren <> Cc: Rafael Wysocki <> Cc: Ralf Baechle <> Cc: Richard Henderson <> Cc: Richard Kuo <> Cc: Russell King <> Cc: Steven Miao <> Cc: Steven Rostedt <> Cc: Stratos Karafotis <> Cc: Tim Chen <> Cc: Tony Luck <> Cc: Vasily Kulikov <> Cc: Vineet Gupta <> Cc: Vineet Gupta <> Cc: Waiman Long <> Cc: Will Deacon <> Cc: Wolfram Sang <> Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Link: Signed-off-by: Ingo Molnar <>
2014-04-18arch,score: Convert smp_mb__*()Peter Zijlstra1-6/+1
score fully relies on asm-generic/barrier.h, so it can use its default implementation. Signed-off-by: Peter Zijlstra <> Acked-by: Paul E. McKenney <> Acked-by: Lennox Wu <> Link: Cc: Chen Liqin <> Cc: Linus Torvalds <> Cc: Signed-off-by: Ingo Molnar <>
2014-04-03score: remove unused CPU_SCORE7 Kconfig parameterMichael Opdenacker1-6/+0
This removes the CPU_SCORE7 Kconfig parameter, which is no longer used anywhere in the source code and Makefiles. Signed-off-by: Michael Opdenacker <> Cc: Chen Liqin <> Cc: Lennox Wu <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-03-13arch: Remove stub cputime.h headersFrederic Weisbecker2-6/+1
Many architectures have a stub cputime.h that only include the default cputime.h Lets remove the useless headers, we only need to mention that we want the default headers on the Kbuild files. Cc: Archs <> Cc: Ingo Molnar <> Cc: Marcelo Tosatti <> Cc: Peter Zijlstra <> Cc: Thomas Gleixner <> Acked-by: Rik van Riel <> Signed-off-by: Frederic Weisbecker <>
2014-02-09locking/mcs: Allow architecture specific asm files to be used for contended caseTim Chen1-0/+1
This patch allows each architecture to add its specific assembly optimized arch_mcs_spin_lock_contended and arch_mcs_spinlock_uncontended for MCS lock and unlock functions. Signed-off-by: Tim Chen <> Cc: Scott J Norton <> Cc: Raghavendra K T <> Cc: AswinChandramouleeswaran <> Cc: George Spelvin <> Cc: Rik vanRiel <> Cc: Andrea Arcangeli <> Cc: MichelLespinasse <> Cc: Peter Hurley <> Cc: Andi Kleen <> Cc: Alex Shi <> Cc: Dave Hansen <> Cc: Tim Chen <> Cc: Arnd Bergmann <> Cc: "Figo.zhang" <> Cc: "Paul E.McKenney" <> Cc: "H. Peter Anvin" <> Cc: Davidlohr Bueso <> Cc: Waiman Long <> Cc: Ingo Molnar <> Cc: Will Deacon <> Cc: Andrew Morton <> Cc: Linus Torvalds <> Cc: Matthew R Wilcox <> Signed-off-by: Peter Zijlstra <> Link: Signed-off-by: Ingo Molnar <>
2014-02-09locking/mcs: Order the header files in Kbuild of each architecture in ↵Tim Chen1-2/+2
alphabetical order We perform a clean up of the Kbuid files in each architecture. We order the files in each Kbuild in alphabetical order by running the below script. for i in arch/*/include/asm/Kbuild do cat $i | gawk '/^generic-y/ { i = 3; do { for (; i <= NF; i++) { if ($i == "\\") { getline; i = 1; continue; } if ($i != "") hdr[$i] = $i; } break; } while (1); next; } // { print $0; } END { n = asort(hdr); for (i = 1; i <= n; i++) print "generic-y += " hdr[i]; }' > ${i}.sorted; mv ${i}.sorted $i; done Signed-off-by: Tim Chen <> Cc: Arnd Bergmann <> Cc: Matthew R Wilcox <> Cc: AswinChandramouleeswaran <> Cc: Dave Hansen <> Cc: "Paul E.McKenney" <> Cc: Scott J Norton <> Cc: Will Deacon <> Cc: "Figo.zhang" <> Cc: Linus Torvalds <> Cc: Rik van Riel <> Cc: Waiman Long <> Cc: Peter Hurley <> Cc: Andrea Arcangeli <> Cc: Tim Chen <> Cc: Alex Shi <> Cc: Raghavendra K T <> Cc: Andi Kleen <> Cc: George Spelvin <> Cc: MichelLespinasse <> Cc: Ingo Molnar <> Cc: "H. Peter Anvin" <> Cc: Davidlohr Bueso <> Cc: Andrew Morton <> Signed-off-by: Peter Zijlstra <> [ Fixed build bug. ] Signed-off-by: Ingo Molnar <>
2014-01-31Merge branch 'v4l_for_linus' of ↵Linus Torvalds1-1/+1
git:// Pull media updates from Mauro Carvalho Chehab: - a new jpeg codec driver for Samsung Exynos (jpeg-hw-exynos4) - a new dvb frontend for ds2103 chipset (m88ds2103) - a new sensor driver for Samsung S5K5BAF UXGA (s5k5baf) - new drivers for R-Car VSP1 - a new radio driver: radio-raremono - a new tuner driver for ts2022 chipset (m88ts2022) - the analog part of em28xx is now a separate module that only load/runs if the device is not a pure digital TV device - added a staging driver for bcm2048 radio devices - the omap 2 video driver (omap24xx) was moved to staging. This driver is for an old hardware and uses a deprecated Kernel internal API. If nobody cares enough to fix it, it would be removed on a couple Kernel releases - the sn9c102 driver was moved to staging. This driver was replaced by gspca, and disabled on some distros, as almost all devices are known to work properly with gspca. It should be removed from kernel on a couple Kernel releases - lots of driver fixes, improvements and cleanups * 'v4l_for_linus' of git:// (421 commits) [media] media: v4l2-dev: fix video device index assignment [media] rc-core: reuse device numbers [media] em28xx-cards: properly initialize the device bitmap [media] Staging: media: Fix line length exceeding 80 characters in as102_drv.c [media] Staging: media: Fix line length exceeding 80 characters in as102_fe.c [media] Staging: media: Fix quoted string split across line in as102_fe.c [media] media: st-rc: Add reset support [media] m2m-deinterlace: fix allocated struct type [media] radio-usb-si4713: fix sparse non static symbol warnings [media] em28xx-audio: remove needless check before usb_free_coherent() [media] au0828: Fix sparse non static symbol warning Revert "[media] go7007-usb: only use go->dev after allocated" [media] em28xx-audio: provide an error code when URB submit fails [media] em28xx: fix check for audio only usb interfaces when changing the usb alternate setting [media] em28xx: fix usb alternate setting for analog and digital video endpoints > 0 [media] em28xx: make 'em28xx_ctrl_ops' static em28xx-alsa: Fix error patch for init/fini [media] em28xx-audio: flush work at .fini [media] drxk: remove the option to load firmware asynchronously [media] em28xx: adjust period size at runtime ...
2014-01-25Merge git:// Torvalds1-0/+2
Pull networking updates from David Miller: 1) BPF debugger and asm tool by Daniel Borkmann. 2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann. 3) Correct reciprocal_divide and update users, from Hannes Frederic Sowa and Daniel Borkmann. 4) Currently we only have a "set" operation for the hw timestamp socket ioctl, add a "get" operation to match. From Ben Hutchings. 5) Add better trace events for debugging driver datapath problems, also from Ben Hutchings. 6) Implement auto corking in TCP, from Eric Dumazet. Basically, if we have a small send and a previous packet is already in the qdisc or device queue, defer until TX completion or we get more data. 7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko. 8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel Borkmann. 9) Share IP header compression code between Bluetooth and IEEE802154 layers, from Jukka Rissanen. 10) Fix ipv6 router reachability probing, from Jiri Benc. 11) Allow packets to be captured on macvtap devices, from Vlad Yasevich. 12) Support tunneling in GRO layer, from Jerry Chu. 13) Allow bonding to be configured fully using netlink, from Scott Feldman. 14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can already get the TCI. From Atzm Watanabe. 15) New "Heavy Hitter" qdisc, from Terry Lam. 16) Significantly improve the IPSEC support in pktgen, from Fan Du. 17) Allow ipv4 tunnels to cache routes, just like sockets. From Tom Herbert. 18) Add Proportional Integral Enhanced packet scheduler, from Vijay Subramanian. 19) Allow openvswitch to mmap'd netlink, from Thomas Graf. 20) Key TCP metrics blobs also by source address, not just destination address. From Christoph Paasch. 21) Support 10G in generic phylib. From Andy Fleming. 22) Try to short-circuit GRO flow compares using device provided RX hash, if provided. From Tom Herbert. The wireless and netfilter folks have been busy little bees too. * git:// (2064 commits) net/cxgb4: Fix referencing freed adapter ipv6: reallocate addrconf router for ipv6 address when lo device up fib_frontend: fix possible NULL pointer dereference rtnetlink: remove IFLA_BOND_SLAVE definition rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info qlcnic: update version to 5.3.55 qlcnic: Enhance logic to calculate msix vectors. qlcnic: Refactor interrupt coalescing code for all adapters. qlcnic: Update poll controller code path qlcnic: Interrupt code cleanup qlcnic: Enhance Tx timeout debugging. qlcnic: Use bool for rx_mac_learn. bonding: fix u64 division rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC sfc: Use the correct maximum TX DMA ring size for SFC9100 Add Shradha Shah as the sfc driver maintainer. net/vxlan: Share RX skb de-marking and checksum checks with ovs tulip: cleanup by using ARRAY_SIZE() ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called net/cxgb4: Don't retrieve stats during recovery ...
2014-01-21score: remove "select HAVE_GENERIC_HARDIRQS" againGeert Uytterhoeven1-1/+0
Commit 5fbbf8a1a934 ("Score: The commit is for compiling successfully.") re-introduced "select HAVE_GENERIC_HARDIRQS" in v3.12-rc4, which had just been removed in v3.12-rc1 by 0244ad004a5 ("Remove GENERIC_HARDIRQ config option"). Signed-off-by: Geert Uytterhoeven <> Cc: Chen Liqin <> Cc: Lennox Wu <> Cc: Martin Schwidefsky <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-01-13arch: Re-sort some Kbuild files to hopefully help avoid some conflictsStephen Rothwell1-1/+1
Checkin: 93ea02bb8435 arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h ... unfortunately left some Kbuild files out of order, which caused unnecessary merge conflicts, in particular with checkin: e3fec2f74f7f lib: Add missing arch generic-y entries for asm-generic/hash.h Put them back in order to make the upcoming merges cleaner. Signed-off-by: Stephen Rothwell <> Link: Signed-off-by: H. Peter Anvin <> Cc: Geert Uytterhoeven <> Cc: "Paul E. McKenney" <> Cc: Mathieu Desnoyers <> Cc: Peter Zijlstra <> Cc: David Miller <>
2014-01-13net: resort some Kbuild files to hopefully help avoid some conflictsStephen Rothwell1-1/+1
Signed-off-by: Stephen Rothwell <> Signed-off-by: David S. Miller <>
2014-01-12arch: Clean up asm/barrier.h implementations using asm-generic/barrier.hPeter Zijlstra2-16/+1
We're going to be adding a few new barrier primitives, and in order to avoid endless duplication make more agressive use of asm-generic/barrier.h. Change the asm-generic/barrier.h such that it allows partial barrier definitions and fills out the rest with defaults. There are a few architectures (m32r, m68k) that could probably do away with their barrier.h file entirely but are kept for now due to their unconventional nop() implementation. Suggested-by: Geert Uytterhoeven <> Reviewed-by: "Paul E. McKenney" <> Reviewed-by: Mathieu Desnoyers <> Signed-off-by: Peter Zijlstra <> Cc: Michael Ellerman <> Cc: Michael Neuling <> Cc: Russell King <> Cc: Heiko Carstens <> Cc: Linus Torvalds <> Cc: Martin Schwidefsky <> Cc: Victor Kaplansky <> Cc: Tony Luck <> Cc: Oleg Nesterov <> Cc: Benjamin Herrenschmidt <> Cc: Frederic Weisbecker <> Link: Signed-off-by: Ingo Molnar <>
2013-12-17lib: Add missing arch generic-y entries for asm-generic/hash.hDavid S. Miller1-0/+2
Reported-by: Stephen Rothwell <> Signed-off-by: David S. Miller <>
2013-12-10[media] doc: no singingKees Cook1-1/+1
Stop that, stop that! You're not going to do a song while I'm here. Signed-off-by: Kees Cook <> Signed-off-by: Mauro Carvalho Chehab <>
2013-11-19Merge branch 'irq-urgent-for-linus' of ↵Linus Torvalds1-2/+0
git:// Pull irq cleanups from Ingo Molnar: "This is a multi-arch cleanup series from Thomas Gleixner, which we kept to near the end of the merge window, to not interfere with architecture updates. This series (motivated by the -rt kernel) unifies more aspects of IRQ handling and generalizes PREEMPT_ACTIVE" * 'irq-urgent-for-linus' of git:// preempt: Make PREEMPT_ACTIVE generic sparc: Use preempt_schedule_irq ia64: Use preempt_schedule_irq m32r: Use preempt_schedule_irq hardirq: Make hardirq bits generic m68k: Simplify low level interrupt handling code genirq: Prevent spurious detection for unconditionally polled interrupts
2013-11-15score: handle pgtable_page_ctor() failKirill A. Shutemov1-3/+6
Signed-off-by: Kirill A. Shutemov <> Cc: Chen Liqin <> Acked-by: Lennox Wu <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2013-11-13preempt: Make PREEMPT_ACTIVE genericThomas Gleixner1-2/+0
No point in having this bit defined by architecture. Signed-off-by: Thomas Gleixner <> Acked-by: Peter Zijlstra <> Link:
2013-10-09Merge tag 'v3.12-rc4' into sched/coreIngo Molnar7-50/+62
Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree before applying more scheduler patches. Conflicts: arch/avr32/include/asm/Kbuild Signed-off-by: Ingo Molnar <>
2013-09-26Score: Modify the Makefile of Score, remove -mlong-calls for compilingLennox Wu1-2/+2
Signed-off-by: Lennox Wu <>
2013-09-26Score: Implement the function csum_ipv6_magicLennox Wu1-42/+51
Signed-off-by: Lennox Wu <>
2013-09-26Score: The commit is for compiling successfully.Lennox Wu5-6/+9
The modifications include: 1. Kconfig of Score: we don't support ioremap 2. Missed headfile including 3. There are some errors in other people's commit not checked by us, we fix it now 3.1 arch/score/kernel/entry.S: wrong instructions 3.2 arch/score/kernel/process.c : just some typos Signed-off-by: Lennox Wu <>
2013-09-25sched, arch: Create asm/preempt.hPeter Zijlstra1-0/+1
In order to prepare to per-arch implementations of preempt_count move the required bits into an asm-generic header and use this for all archs. Signed-off-by: Peter Zijlstra <> Link: Signed-off-by: Ingo Molnar <>
2013-09-13Remove GENERIC_HARDIRQ config optionMartin Schwidefsky1-1/+0
After the last architecture switched to generic hard irqs the config options HAVE_GENERIC_HARDIRQS & GENERIC_HARDIRQS and the related code for !CONFIG_GENERIC_HARDIRQS can be removed. Signed-off-by: Martin Schwidefsky <>
2013-09-12arch: mm: pass userspace fault flag to generic fault handlerJohannes Weiner1-1/+6
Unlike global OOM handling, memory cgroup code will invoke the OOM killer in any OOM situation because it has no way of telling faults occuring in kernel context - which could be handled more gracefully - from user-triggered faults. Pass a flag that identifies faults originating in user space from the architecture-specific fault handlers to generic code so that memcg OOM handling can be improved. Signed-off-by: Johannes Weiner <> Reviewed-by: Michal Hocko <> Cc: David Rientjes <> Cc: KAMEZAWA Hiroyuki <> Cc: azurIt <> Cc: KOSAKI Motohiro <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2013-09-12arch: mm: remove obsolete init OOM protectionJohannes Weiner1-6/+0
The memcg code can trap tasks in the context of the failing allocation until an OOM situation is resolved. They can hold all kinds of locks (fs, mm) at this point, which makes it prone to deadlocking. This series converts memcg OOM handling into a two step process that is started in the charge context, but any waiting is done after the fault stack is fully unwound. Patches 1-4 prepare architecture handlers to support the new memcg requirements, but in doing so they also remove old cruft and unify out-of-memory behavior across architectures. Patch 5 disables the memcg OOM handling for syscalls, readahead, kernel faults, because they can gracefully unwind the stack with -ENOMEM. OOM handling is restricted to user triggered faults that have no other option. Patch 6 reworks memcg's hierarchical OOM locking to make it a little more obvious wth is going on in there: reduce locked regions, rename locking functions, reorder and document. Patch 7 implements the two-part OOM handling such that tasks are never trapped with the full charge stack in an OOM situation. This patch: Back before smart OOM killing, when faulting tasks were killed directly on allocation failures, the arch-specific fault handlers needed special protection for the init process. Now that all fault handlers call into the generic OOM killer (see commit 609838cfed97: "mm: invoke oom-killer from remaining unconverted page fault handlers"), which already provides init protection, the arch-specific leftovers can be removed. Signed-off-by: Johannes Weiner <> Reviewed-by: Michal Hocko <> Acked-by: KOSAKI Motohiro <> Cc: David Rientjes <> Cc: KAMEZAWA Hiroyuki <> Cc: azurIt <> Acked-by: Vineet Gupta <> [arch/arc bits] Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2013-08-13arch: *: Kconfig: add "kernel/Kconfig.freezer" to "arch/*/Kconfig"Chen Gang1-0/+2
All architectures include "kernel/Kconfig.freezer" except three left, so let them include it too, or 'allmodconfig' will report error. The related errors: (with allmodconfig for openrisc): CC kernel/cgroup_freezer.o kernel/cgroup_freezer.c: In function 'freezer_css_online': kernel/cgroup_freezer.c:133:15: error: 'system_freezing_cnt' undeclared (first use in this function) kernel/cgroup_freezer.c:133:15: note: each undeclared identifier is reported only once for each function it appears in kernel/cgroup_freezer.c: In function 'freezer_css_offline': kernel/cgroup_freezer.c:157:15: error: 'system_freezing_cnt' undeclared (first use in this function) kernel/cgroup_freezer.c: In function 'freezer_attach': kernel/cgroup_freezer.c:200:4: error: implicit declaration of function 'freeze_task' kernel/cgroup_freezer.c: In function 'freezer_apply_state': kernel/cgroup_freezer.c:371:16: error: 'system_freezing_cnt' undeclared (first use in this function) Signed-off-by: Chen Gang <> Cc: Richard Kuo <> Cc: Jonas Bonn <> Cc: Chen Liqin <> Cc: Lennox Wu <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2013-07-14score: delete __cpuinit usage from all score filesPaul Gortmaker1-1/+1
The __cpuinit type of throwaway sections might have made sense some time ago when RAM was more constrained, but now the savings do not offset the cost and complications. For example, the fix in commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time") is a good example of the nasty type of bugs that can be created with improper use of the various __init prefixes. After a discussion on LKML[1] it was decided that cpuinit should go the way of devinit and be phased out. Once all the users are gone, we can then finally remove the macros themselves from linux/init.h. Note that some harmless section mismatch warnings may result, since notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c) are flagged as __cpuinit -- so if we remove the __cpuinit from arch specific callers, we will also get section mismatch warnings. As an intermediate step, we intend to turn the linux/init.h cpuinit content into no-ops as early as possible, since that will get rid of these warnings. In any case, they are temporary and harmless. This removes all the arch/score uses of the __cpuinit macros from all C files. Currently score does not have any __CPUINIT used in assembly files. [1] Cc: Chen Liqin <> Cc: Lennox Wu <> Signed-off-by: Paul Gortmaker <>
2013-07-09mm: invoke oom-killer from remaining unconverted page fault handlersJohannes Weiner1-4/+4
A few remaining architectures directly kill the page faulting task in an out of memory situation. This is usually not a good idea since that task might not even use a significant amount of memory and so may not be the optimal victim to resolve the situation. Since 2.6.29's 1c0fe6e ("mm: invoke oom-killer from page fault") there is a hook that architecture page fault handlers are supposed to call to invoke the OOM killer and let it pick the right task to kill. Convert the remaining architectures over to this hook. To have the previous behavior of simply taking out the faulting task the vm.oom_kill_allocating_task sysctl can be set to 1. Signed-off-by: Johannes Weiner <> Reviewed-by: Michal Hocko <> Cc: KAMEZAWA Hiroyuki <> Acked-by: David Rientjes <> Acked-by: Vineet Gupta <> [arch/arc bits] Cc: James Hogan <> Cc: David Howells <> Cc: Jonas Bonn <> Cc: Chen Liqin <> Cc: Lennox Wu <> Cc: Chris Metcalf <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2013-07-03Merge branch 'akpm' (updates from Andrew Morton)Linus Torvalds2-26/+6
Merge first patch-bomb from Andrew Morton: - various misc bits - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been distracted. There has been quite a bit of activity. - About half the MM queue - Some backlight bits - Various lib/ updates - checkpatch updates - zillions more little rtc patches - ptrace - signals - exec - procfs - rapidio - nbd - aoe - pps - memstick - tools/testing/selftests updates * emailed patches from Andrew Morton <>: (445 commits) tools/testing/selftests: don't assume the x bit is set on scripts selftests: add .gitignore for kcmp selftests: fix clean target in kcmp Makefile selftests: add .gitignore for vm selftests: add hugetlbfstest self-test: fix make clean selftests: exit 1 on failure kernel/resource.c: remove the unneeded assignment in function __find_resource aio: fix wrong comment in aio_complete() drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode drivers/memstick/host/r592.c: convert to module_pci_driver drivers/memstick/host/jmb38x_ms: convert to module_pci_driver pps-gpio: add device-tree binding and support drivers/pps/clients/pps-gpio.c: convert to module_platform_driver drivers/pps/clients/pps-gpio.c: convert to devm_* helpers drivers/parport/share.c: use kzalloc Documentation/accounting/getdelays.c: avoid strncpy in accounting tool aoe: update internal version number to v83 aoe: update copyright date aoe: perform I/O completions in parallel ...
2013-07-03mm/score: prepare for removing num_physpages and simplify mem_init()Jiang Liu1-24/+2
Prepare for removing num_physpages and simplify mem_init(). Signed-off-by: Jiang Liu <> Cc: Chen Liqin <> Cc: Lennox Wu <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2013-07-03score: normalize global variables exported by vmlinux.ldsJiang Liu1-0/+1
Generate mandatory global variables _sdata in file Signed-off-by: Jiang Liu <> Cc: Chen Liqin <> Cc: Lennox Wu <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>