diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-04 18:16:39 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-04 18:16:39 +0200 |
| commit | 04782ca20a8ebb5acf0c35756a38964ae5ea7321 (patch) | |
| tree | ebf475793bb17444d3a1e21974617f27e8ff3a4b /arch/arm/kernel/entry-armv.S | |
| parent | regmap: Support bulk reads for devices without raw formatting (diff) | |
| parent | regmap: fix a NULL pointer dereference in __regmap_init (diff) | |
| download | linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.tar.xz linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.zip | |
Merge branch 'topic/smbus-block' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-core
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 7dac3086e361..cb4fb1e69778 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -410,7 +410,7 @@ ENDPROC(__fiq_abt) zero_fp .if \trace -#ifdef CONFIG_IRQSOFF_TRACER +#ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off #endif ct_user_exit save = 0 |