Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
Pull ARM development updates from Russell King:
- Use string choices helpers
- Add support for HAVE_FUNCTION_GRAPH_FREGS
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
ARM: 9457/1: ftrace: Implement HAVE_FUNCTION_GRAPH_FREGS
ARM: 9456/1: mm: fault: use string choices helper
ARM: 9454/1: kernel: bios32: use string choices helper
ARM: 9451/1: mm: l2x0: use string choices helper
+23
-11
+1
arch/arm/Kconfig
+1
arch/arm/Kconfig
···
108
108
select HAVE_GUP_FAST if ARM_LPAE
109
109
select HAVE_FUNCTION_ERROR_INJECTION
110
110
select HAVE_FUNCTION_GRAPH_TRACER
111
+
select HAVE_FUNCTION_GRAPH_FREGS
111
112
select HAVE_FUNCTION_TRACER if !XIP_KERNEL
112
113
select HAVE_GCC_PLUGINS
113
114
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
+3
-2
arch/arm/kernel/bios32.c
+3
-2
arch/arm/kernel/bios32.c
···
10
10
#include <linux/kernel.h>
11
11
#include <linux/pci.h>
12
12
#include <linux/slab.h>
13
+
#include <linux/string_choices.h>
13
14
#include <linux/init.h>
14
15
#include <linux/io.h>
15
16
···
338
337
/*
339
338
* Report what we did for this bus
340
339
*/
341
-
pr_info("PCI: bus%d: Fast back to back transfers %sabled\n",
342
-
bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");
340
+
pr_info("PCI: bus%d: Fast back to back transfers %s\n",
341
+
bus->number, str_enabled_disabled(features & PCI_COMMAND_FAST_BACK));
343
342
}
344
343
EXPORT_SYMBOL(pcibios_fixup_bus);
345
344
+14
-4
arch/arm/kernel/entry-ftrace.S
+14
-4
arch/arm/kernel/entry-ftrace.S
···
257
257
258
258
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
259
259
ENTRY(return_to_handler)
260
-
stmdb sp!, {r0-r3}
261
-
add r0, sp, #16 @ sp at exit of instrumented routine
260
+
mov ip, sp @ sp at exit of instrumented routine
261
+
sub sp, #PT_REGS_SIZE
262
+
str r0, [sp, #S_R0]
263
+
str r1, [sp, #S_R1]
264
+
str r2, [sp, #S_R2]
265
+
str r3, [sp, #S_R3]
266
+
str ip, [sp, #S_FP]
267
+
mov r0, sp
262
268
bl ftrace_return_to_handler
263
-
mov lr, r0 @ r0 has real ret addr
264
-
ldmia sp!, {r0-r3}
269
+
mov lr, r0 @ r0 has real ret addr
270
+
ldr r3, [sp, #S_R3]
271
+
ldr r2, [sp, #S_R2]
272
+
ldr r1, [sp, #S_R1]
273
+
ldr r0, [sp, #S_R0]
274
+
add sp, sp, #PT_REGS_SIZE @ restore stack pointer
265
275
ret lr
266
276
ENDPROC(return_to_handler)
267
277
#endif
+4
-3
arch/arm/mm/cache-l2x0.c
+4
-3
arch/arm/mm/cache-l2x0.c
···
13
13
#include <linux/io.h>
14
14
#include <linux/of.h>
15
15
#include <linux/of_address.h>
16
+
#include <linux/string_choices.h>
16
17
17
18
#include <asm/cacheflush.h>
18
19
#include <asm/cp15.h>
···
668
667
u32 power_ctrl;
669
668
670
669
power_ctrl = readl_relaxed(base + L310_POWER_CTRL);
671
-
pr_info("L2C-310 dynamic clock gating %sabled, standby mode %sabled\n",
672
-
power_ctrl & L310_DYNAMIC_CLK_GATING_EN ? "en" : "dis",
673
-
power_ctrl & L310_STNDBY_MODE_EN ? "en" : "dis");
670
+
pr_info("L2C-310 dynamic clock gating %s, standby mode %s\n",
671
+
str_enabled_disabled(power_ctrl & L310_DYNAMIC_CLK_GATING_EN),
672
+
str_enabled_disabled(power_ctrl & L310_STNDBY_MODE_EN));
674
673
}
675
674
676
675
if (aux & L310_AUX_CTRL_FULL_LINE_ZERO)
+1
-2
arch/arm/mm/fault.c
+1
-2
arch/arm/mm/fault.c
···
135
135
bust_spinlocks(1);
136
136
pr_alert("8<--- cut here ---\n");
137
137
pr_alert("Unable to handle kernel %s at virtual address %08lx when %s\n",
138
-
msg, addr, fsr & FSR_LNX_PF ? "execute" :
139
-
fsr & FSR_WRITE ? "write" : "read");
138
+
msg, addr, fsr & FSR_LNX_PF ? "execute" : str_write_read(fsr & FSR_WRITE));
140
139
141
140
show_pte(KERN_ALERT, mm, addr);
142
141
die("Oops", regs, fsr);