Skip to content

Commit 888a8a3

Browse files
author
Ingo Molnar
committed
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2 parents cfff2d9 + b06b3d4 commit 888a8a3

File tree

202 files changed

+2382
-2525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+2382
-2525
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ modules.builtin
2828
*.gz
2929
*.bz2
3030
*.lzma
31+
*.xz
3132
*.lzo
3233
*.patch
3334
*.gcno

‎Documentation/DocBook/filesystems.tmpl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@
8282
</sect1>
8383
</chapter>
8484

85+
<chapter id="fs_events">
86+
<title>Events based on file descriptors</title>
87+
!Efs/eventfd.c
88+
</chapter>
89+
8590
<chapter id="sysfs">
8691
<title>The Filesystem for Exporting Kernel Objects</title>
8792
!Efs/sysfs/file.c

‎Documentation/hwmon/jc42

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ Supported chips:
5151
* JEDEC JC 42.4 compliant temperature sensor chips
5252
Prefix: 'jc42'
5353
Addresses scanned: I2C 0x18 - 0x1f
54-
Datasheet: -
54+
Datasheet:
55+
http://www.jedec.org/sites/default/files/docs/4_01_04R19.pdf
5556

5657
Author:
5758
Guenter Roeck <guenter.roeck@ericsson.com>
@@ -60,7 +61,11 @@ Author:
6061
Description
6162
-----------
6263

63-
This driver implements support for JEDEC JC 42.4 compliant temperature sensors.
64+
This driver implements support for JEDEC JC 42.4 compliant temperature sensors,
65+
which are used on many DDR3 memory modules for mobile devices and servers. Some
66+
systems use the sensor to prevent memory overheating by automatically throttling
67+
the memory controller.
68+
6469
The driver auto-detects the chips listed above, but can be manually instantiated
6570
to support other JC 42.4 compliant chips.
6671

@@ -81,15 +86,19 @@ limits. The chip supports only a single register to configure the hysteresis,
8186
which applies to all limits. This register can be written by writing into
8287
temp1_crit_hyst. Other hysteresis attributes are read-only.
8388

89+
If the BIOS has configured the sensor for automatic temperature management, it
90+
is likely that it has locked the registers, i.e., that the temperature limits
91+
cannot be changed.
92+
8493
Sysfs entries
8594
-------------
8695

8796
temp1_input Temperature (RO)
88-
temp1_min Minimum temperature (RW)
89-
temp1_max Maximum temperature (RW)
90-
temp1_crit Critical high temperature (RW)
97+
temp1_min Minimum temperature (RO or RW)
98+
temp1_max Maximum temperature (RO or RW)
99+
temp1_crit Critical high temperature (RO or RW)
91100

92-
temp1_crit_hyst Critical hysteresis temperature (RW)
101+
temp1_crit_hyst Critical hysteresis temperature (RO or RW)
93102
temp1_max_hyst Maximum hysteresis temperature (RO)
94103

95104
temp1_min_alarm Temperature low alarm

‎Documentation/hwmon/k10temp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Supported chips:
99
Socket S1G3: Athlon II, Sempron, Turion II
1010
* AMD Family 11h processors:
1111
Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)
12+
* AMD Family 12h processors: "Llano"
13+
* AMD Family 14h processors: "Brazos" (C/E/G-Series)
1214

1315
Prefix: 'k10temp'
1416
Addresses scanned: PCI space
@@ -17,10 +19,14 @@ Supported chips:
1719
http://support.amd.com/us/Processor_TechDocs/31116.pdf
1820
BIOS and Kernel Developer's Guide (BKDG) for AMD Family 11h Processors:
1921
http://support.amd.com/us/Processor_TechDocs/41256.pdf
22+
BIOS and Kernel Developer's Guide (BKDG) for AMD Family 14h Models 00h-0Fh Processors:
23+
http://support.amd.com/us/Processor_TechDocs/43170.pdf
2024
Revision Guide for AMD Family 10h Processors:
2125
http://support.amd.com/us/Processor_TechDocs/41322.pdf
2226
Revision Guide for AMD Family 11h Processors:
2327
http://support.amd.com/us/Processor_TechDocs/41788.pdf
28+
Revision Guide for AMD Family 14h Models 00h-0Fh Processors:
29+
http://support.amd.com/us/Processor_TechDocs/47534.pdf
2430
AMD Family 11h Processor Power and Thermal Data Sheet for Notebooks:
2531
http://support.amd.com/us/Processor_TechDocs/43373.pdf
2632
AMD Family 10h Server and Workstation Processor Power and Thermal Data Sheet:
@@ -34,7 +40,7 @@ Description
3440
-----------
3541

3642
This driver permits reading of the internal temperature sensor of AMD
37-
Family 10h and 11h processors.
43+
Family 10h/11h/12h/14h processors.
3844

3945
All these processors have a sensor, but on those for Socket F or AM2+,
4046
the sensor may return inconsistent values (erratum 319). The driver

‎Documentation/kernel-parameters.txt

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@ a fixed number of characters. This limit depends on the architecture
144144
and is between 256 and 4096 characters. It is defined in the file
145145
./include/asm/setup.h as COMMAND_LINE_SIZE.
146146

147+
Finally, the [KMG] suffix is commonly described after a number of kernel
148+
parameter values. These 'K', 'M', and 'G' letters represent the _binary_
149+
multipliers 'Kilo', 'Mega', and 'Giga', equalling 2^10, 2^20, and 2^30
150+
bytes respectively. Such letter suffixes can also be entirely omitted.
151+
147152

148153
acpi= [HW,ACPI,X86]
149154
Advanced Configuration and Power Interface
@@ -545,16 +550,20 @@ and is between 256 and 4096 characters. It is defined in the file
545550
Format:
546551
<first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
547552

548-
crashkernel=nn[KMG]@ss[KMG]
549-
[KNL] Reserve a chunk of physical memory to
550-
hold a kernel to switch to with kexec on panic.
553+
crashkernel=size[KMG][@offset[KMG]]
554+
[KNL] Using kexec, Linux can switch to a 'crash kernel'
555+
upon panic. This parameter reserves the physical
556+
memory region [offset, offset + size] for that kernel
557+
image. If '@offset' is omitted, then a suitable offset
558+
is selected automatically. Check
559+
Documentation/kdump/kdump.txt for further details.
551560

552561
crashkernel=range1:size1[,range2:size2,...][@offset]
553562
[KNL] Same as above, but depends on the memory
554563
in the running system. The syntax of range is
555564
start-[end] where start and end are both
556565
a memory unit (amount[KMG]). See also
557-
Documentation/kdump/kdump.txt for a example.
566+
Documentation/kdump/kdump.txt for an example.
558567

559568
cs89x0_dma= [HW,NET]
560569
Format: <dma>
@@ -1262,10 +1271,9 @@ and is between 256 and 4096 characters. It is defined in the file
12621271
6 (KERN_INFO) informational
12631272
7 (KERN_DEBUG) debug-level messages
12641273

1265-
log_buf_len=n Sets the size of the printk ring buffer, in bytes.
1266-
Format: { n | nk | nM }
1267-
n must be a power of two. The default size
1268-
is set in the kernel config file.
1274+
log_buf_len=n[KMG] Sets the size of the printk ring buffer,
1275+
in bytes. n must be a power of two. The default
1276+
size is set in the kernel config file.
12691277

12701278
logo.nologo [FB] Disables display of the built-in Linux logo.
12711279
This may be used to provide more screen space for

‎Documentation/networking/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ obj- := dummy.o
44
# List of programs to build
55
hostprogs-y := ifenslave
66

7+
HOSTCFLAGS_ifenslave.o += -I$(objtree)/usr/include
8+
79
# Tell kbuild to always build the programs
810
always := $(hostprogs-y)
911

‎Documentation/workqueue.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ resources, scheduled and executed.
190190
* Long running CPU intensive workloads which can be better
191191
managed by the system scheduler.
192192

193-
WQ_FREEZEABLE
193+
WQ_FREEZABLE
194194

195-
A freezeable wq participates in the freeze phase of the system
195+
A freezable wq participates in the freeze phase of the system
196196
suspend operations. Work items on the wq are drained and no
197197
new work item starts execution until thawed.
198198

‎MAINTAINERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ S: Supported
885885

886886
ARM/QUALCOMM MSM MACHINE SUPPORT
887887
M: David Brown <davidb@codeaurora.org>
888-
M: Daniel Walker <dwalker@codeaurora.org>
888+
M: Daniel Walker <dwalker@fifo99.com>
889889
M: Bryan Huntsman <bryanh@codeaurora.org>
890890
L: linux-arm-msm@vger.kernel.org
891891
F: arch/arm/mach-msm/
@@ -2873,7 +2873,6 @@ M: Guenter Roeck <guenter.roeck@ericsson.com>
28732873
L: lm-sensors@lm-sensors.org
28742874
W: http://www.lm-sensors.org/
28752875
T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
2876-
T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/
28772876
T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
28782877
S: Maintained
28792878
F: Documentation/hwmon/

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 2
22
PATCHLEVEL = 6
33
SUBLEVEL = 38
4-
EXTRAVERSION = -rc5
4+
EXTRAVERSION = -rc6
55
NAME = Flesh-Eating Bats with Fangs
66

77
# *DOCUMENTATION*

‎arch/arm/Kconfig

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,31 @@ config ARM_ERRATA_743622
11771177
visible impact on the overall performance or power consumption of the
11781178
processor.
11791179

1180+
config ARM_ERRATA_751472
1181+
bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation"
1182+
depends on CPU_V7 && SMP
1183+
help
1184+
This option enables the workaround for the 751472 Cortex-A9 (prior
1185+
to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the
1186+
completion of a following broadcasted operation if the second
1187+
operation is received by a CPU before the ICIALLUIS has completed,
1188+
potentially leading to corrupted entries in the cache or TLB.
1189+
1190+
config ARM_ERRATA_753970
1191+
bool "ARM errata: cache sync operation may be faulty"
1192+
depends on CACHE_PL310
1193+
help
1194+
This option enables the workaround for the 753970 PL310 (r3p0) erratum.
1195+
1196+
Under some condition the effect of cache sync operation on
1197+
the store buffer still remains when the operation completes.
1198+
This means that the store buffer is always asked to drain and
1199+
this prevents it from merging any further writes. The workaround
1200+
is to replace the normal offset of cache sync operation (0x730)
1201+
by another offset targeting an unmapped PL310 register 0x740.
1202+
This has the same effect as the cache sync operation: store buffer
1203+
drain and waiting for all buffers empty.
1204+
11801205
endmenu
11811206

11821207
source "arch/arm/common/Kconfig"

‎arch/arm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
1515
LDFLAGS_vmlinux += --be8
1616
endif
1717

18-
OBJCOPYFLAGS :=-O binary -R .note -R .note.gnu.build-id -R .comment -S
18+
OBJCOPYFLAGS :=-O binary -R .comment -S
1919
GZFLAGS :=-9
2020
#KBUILD_CFLAGS +=-pipe
2121
# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:

‎arch/arm/boot/compressed/.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
font.c
2-
piggy.gz
2+
lib1funcs.S
3+
piggy.gzip
4+
piggy.lzo
5+
piggy.lzma
6+
vmlinux
37
vmlinux.lds

‎arch/arm/include/asm/hardware/cache-l2x0.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#define L2X0_RAW_INTR_STAT 0x21C
3737
#define L2X0_INTR_CLEAR 0x220
3838
#define L2X0_CACHE_SYNC 0x730
39+
#define L2X0_DUMMY_REG 0x740
3940
#define L2X0_INV_LINE_PA 0x770
4041
#define L2X0_INV_WAY 0x77C
4142
#define L2X0_CLEAN_LINE_PA 0x7B0

‎arch/arm/include/asm/hardware/sp810.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858

5959
static inline void sysctl_soft_reset(void __iomem *base)
6060
{
61+
/* switch to slow mode */
62+
writel(0x2, base + SCCTRL);
63+
6164
/* writing any value to SCSYSSTAT reg will reset system */
6265
writel(0, base + SCSYSSTAT);
6366
}

0 commit comments

Comments
 (0)