Bartlomiej Zolnierkiewicz f6f1ae82bd ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops ... Ifdef around cpu_\name\()_do_suspend and cpu_\name\()_do_resume ops in proc-macros.S should check for CONFIG_ARM_CPU_SUSPEND and not CONFIG_PM_SLEEP. Fix it. [ Please note that cpu_v7_do_[suspend,resume] code in proc-v7.S already correctly checks for CONFIG_ARM_CPU_SUSPEND, same is true for functions for other architectures. ] This fix is needed for decoupling suspend/resume and advanced cpuidle support on Exynos platform (next patch fixes build for config with CONFIG_PM_SLEEP=n and CONFIG_ARM_EXYNOS_CPUIDLE=y). If this fix is not present then the following OOPS happens on the first attempt to go into advanced cpuidle mode (AFTR): [ 22.244143] Unable to handle kernel NULL pointer dereference at virtual address 00000000 [ 22.250759] pgd = c0004000 [ 22.253445] [00000000] *pgd=00000000 [ 22.257012] Internal error: Oops: 80000007 [#1] PREEMPT SMP ARM [ 22.262906] Modules linked in: [ 22.265949] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.16.0-next-20140811-dirty #730 [ 22.273757] task: c05dce68 ti: c05d2000 task.ti: c05d2000 [ 22.279139] PC is at 0x0 [ 22.281661] LR is at __cpu_suspend_save+0x4c/0xa8 [ 22.286344] pc : [<00000000>] lr : [<c00125e0>] psr: a0000093 [ 22.286344] sp : c05d3ef4 ip : c05da414 fp : 00000001 [ 22.297799] r10: c05da414 r9 : c0609cb0 r8 : 0000000f [ 22.303008] r7 : c05da444 r6 : 00000038 r5 : ea802c00 r4 : c05d3f14 [ 22.309517] r3 : 00000000 r2 : c05d3f4c r1 : 00000038 r0 : c05d3f20 [ 22.316029] Flags: NzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel [ 22.323406] Control: 10c5387d Table: 69d5404a DAC: 00000015 [ 22.329135] Process swapper/0 (pid: 0, stack limit = 0xc05d2240) [ 22.335124] Stack: (0xc05d3ef4 to 0xc05d4000) [ 22.339466] 3ee0: ea802c00 00000038 c05d3f4c [ 22.347626] 3f00: 00000000 00000007 c00123bc 00000000 c001d468 6a888000 c05d3f4c 80000000 [ 22.355785] 3f20: 00000007 c003d3a0 0000193d eaf9dde4 eaf9dde4 c02ef0c8 c000969c fffffffe [ 22.363944] 3f40: 00000000 c0037b54 eaf9dbb8 e9d1a380 00000000 c001d468 c0609cb0 00000000 [ 22.372103] 3f60: c0609cb0 c061649e 00000001 c001250c eaf9dbb8 00000001 c0609cb0 c001d618 [ 22.380262] 3f80: c001d5d0 c02ef56c 2d9d2e1e 00000005 eaf9dbb8 c02edcc4 2d9d2e1e 00000005 [ 22.388421] 3fa0: c040446c c05da4ec c040446c eaf9dbb8 c05cfbb0 c004c580 c05dce68 c05b3ae8 [ 22.396580] 3fc0: 00000000 c058bb24 ffffffff ffffffff c058b5e4 00000000 00000000 c05b3ae8 [ 22.404740] 3fe0: c0616994 c05da47c c05b3ae4 c05ddeec 4000406a 40008074 00000000 00000000 [ 22.412909] [<c00125e0>] (__cpu_suspend_save) from [<c00123bc>] (__cpu_suspend+0x5c/0x70) [ 22.421074] [<c00123bc>] (__cpu_suspend) from [<c05d3f4c>] (init_thread_union+0x1f4c/0x2000) [ 22.429479] Code: bad PC value [ 22.432518] ---[ end trace fb90ebf4217d0ad9 ]--- [ 22.437116] Kernel panic - not syncing: Attempted to kill the idle task! [ 22.443800] Rebooting in 5 seconds.. This patch has been tested on Exynos4210 based Origen board. Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>		2014-09-24 02:47:44 +09:00
..
boot	ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12	2014-09-24 02:47:42 +09:00
common	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-08-11 07:14:01 -07:00
configs	ARM: SoC defconfig updates for 3.17	2014-08-08 11:35:11 -07:00
crypto	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-08-05 10:05:29 -07:00
firmware
include	ARM: wire up memfd_create syscall	2014-08-09 14:07:59 +01:00
kernel	Nicolas Pitre added generic tracepoints for tracing IPIs and updated the	2014-08-09 17:33:44 -07:00
kvm	Here are the PPC and ARM changes for KVM, which I separated because	2014-08-07 11:35:30 -07:00
lib	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
mach-at91	This is the bulk of GPIO changes for the v3.17 development	2014-08-08 18:00:35 -07:00
mach-axxia
mach-bcm	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
mach-berlin
mach-clps711x	ARM: SoC cleanups for 3.17	2014-08-08 11:00:26 -07:00
mach-cns3xxx
mach-davinci	ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+	2014-07-18 12:29:04 +01:00
mach-dove
mach-ebsa110	ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>	2014-07-29 23:08:52 +01:00
mach-efm32
mach-ep93xx	ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>	2014-07-29 23:08:52 +01:00
mach-exynos	ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n	2014-09-24 02:47:43 +09:00
mach-footbridge	ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>	2014-07-29 23:08:52 +01:00
mach-gemini
mach-highbank	PM / OPP: Remove ARCH_HAS_OPP	2014-07-23 00:51:30 +02:00
mach-hisi	ARM: hisi: remove smp from machine descriptor	2014-07-30 22:32:21 -07:00
mach-imx	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
mach-integrator	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
mach-iop13xx	ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>	2014-07-29 23:08:52 +01:00
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone
mach-ks8695	ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>	2014-07-29 23:08:52 +01:00
mach-lpc32xx
mach-mediatek	arm: add basic support for Mediatek MT6589 boards	2014-07-22 17:52:37 +02:00
mach-mmp
mach-moxart
mach-msm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-08-06 21:03:53 -07:00
mach-mv78xx0
mach-mvebu	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
mach-mxs
mach-netx
mach-nomadik
mach-nspire
mach-omap1	ARM: SoC cleanups for 3.17	2014-08-08 11:00:26 -07:00
mach-omap2	Few fixes for the v3.17 merge window:	2014-08-09 08:23:27 -07:00
mach-orion5x
mach-picoxcell
mach-prima2
mach-pxa	Merge branch 'akpm' (second patchbomb from Andrew Morton)	2014-08-08 15:57:47 -07:00
mach-qcom
mach-realview	ARM: SoC cleanups for 3.17	2014-08-08 11:00:26 -07:00
mach-rockchip	ARM: SoC device-tree changes for 3.17	2014-08-08 11:16:58 -07:00
mach-rpc	ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>	2014-07-29 23:08:52 +01:00
mach-s3c24xx	Merge branch 'akpm' (second patchbomb from Andrew Morton)	2014-08-08 15:57:47 -07:00
mach-s3c64xx	ARM: SAMSUNG: Remove legacy clock code	2014-07-19 04:24:59 +09:00
mach-s5pv210	ARM: SoC cleanups for 3.17	2014-08-08 11:00:26 -07:00
mach-sa1100	ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>	2014-07-29 23:08:52 +01:00
mach-shmobile	ARM: SoC device-tree changes for 3.17	2014-08-08 11:16:58 -07:00
mach-socfpga
mach-spear	ARM: SoC driver changes for 3.17	2014-08-08 11:34:32 -07:00
mach-sti
mach-sunxi	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
mach-tegra	This is the bulk of GPIO changes for the v3.17 development	2014-08-08 18:00:35 -07:00
mach-u300
mach-ux500
mach-versatile	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
mach-vexpress	ARM: SoC cleanups for 3.17	2014-08-08 11:00:26 -07:00
mach-vt8500
mach-w90x900	arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto	2014-08-08 15:57:28 -07:00
mach-zynq	PM / OPP: Remove ARCH_HAS_OPP	2014-07-23 00:51:30 +02:00
mm	ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops	2014-09-24 02:47:44 +09:00
net	net: filter: split 'struct sk_filter' into socket and bpf parts	2014-08-02 15:03:58 -07:00
nwfpe	ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+	2014-07-18 12:29:04 +01:00
oprofile	Merge branch 'devel-stable' into for-next	2014-08-05 10:27:25 +01:00
plat-iop
plat-omap	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
plat-orion
plat-pxa
plat-samsung	ARM: SAMSUNG: Restore Samsung PM Debug functionality	2014-09-24 02:47:43 +09:00
plat-versatile
tools
vfp	ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+	2014-07-18 12:29:04 +01:00
xen	arm/xen: remove duplicate arch_gnttab_init() function	2014-08-11 11:59:14 +01:00
Kconfig	Merge branch 'akpm' (second patchbomb from Andrew Morton)	2014-08-08 15:57:47 -07:00
Kconfig-nommu
Kconfig.debug	ARM: SoC device-tree changes for 3.17	2014-08-08 11:16:58 -07:00
Makefile	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00