Revision 16ec54ad1502a095a35b4ae3bf6ec129111a44c5 authored by Linus Torvalds on 19 January 2014, 21:06:51 UTC, committed by Linus Torvalds on 19 January 2014, 21:06:51 UTC
Pull perf fixes from Ingo Molnar:
- an s2ram related fix on AMD systems
- a perf fault handling bug that is relatively old but which has become
much easier to trigger in v3.13 after commit e00b12e64be9 ("perf/x86:
Further optimize copy_from_user_nmi()")
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/amd/ibs: Fix waking up from S3 for AMD family 10h
x86, mm, perf: Allow recursive faults from interrupts
Kconfig
#
# IEC 62439-3 High-availability Seamless Redundancy
#
config HSR
tristate "High-availability Seamless Redundancy (HSR)"
---help---
If you say Y here, then your Linux box will be able to act as a
DANH ("Doubly attached node implementing HSR"). For this to work,
your Linux box needs (at least) two physical Ethernet interfaces,
and it must be connected as a node in a ring network together with
other HSR capable nodes.
All Ethernet frames sent over the hsr device will be sent in both
directions on the ring (over both slave ports), giving a redundant,
instant fail-over network. Each HSR node in the ring acts like a
bridge for HSR frames, but filters frames that have been forwarded
earlier.
This code is a "best effort" to comply with the HSR standard as
described in IEC 62439-3:2010 (HSRv0), but no compliancy tests have
been made.
You need to perform any and all necessary tests yourself before
relying on this code in a safety critical system!
If unsure, say N.
Computing file changes ...
