diff options
| author | Linus Torvalds | 2016-12-07 20:39:27 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-12-07 20:39:27 +0100 |
| commit | ea5a9eff96fed8252f3a8c94a84959f981a93cae (patch) | |
| tree | 4931c77356d62f40401ebb550f635ea488394d17 /arch/x86/platform | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | x86/unwind: Fix guess-unwinder regression (diff) | |
| download | kernel-qcow2-linux-ea5a9eff96fed8252f3a8c94a84959f981a93cae.tar.gz kernel-qcow2-linux-ea5a9eff96fed8252f3a8c94a84959f981a93cae.tar.xz kernel-qcow2-linux-ea5a9eff96fed8252f3a8c94a84959f981a93cae.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes: a core dumping crash fix, a guess-unwinder regression fix,
plus three build warning fixes"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/unwind: Fix guess-unwinder regression
x86/build: Annotate die() with noreturn to fix build warning on clang
x86/platform/olpc: Fix resume handler build warning
x86/apic/uv: Silence a shift wrapping warning
x86/coredump: Always use user_regs_struct for compat_elf_gregset_t
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/olpc/olpc-xo15-sci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index 55130846ac87..c0533fbc39e3 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c @@ -196,6 +196,7 @@ static int xo15_sci_remove(struct acpi_device *device) return 0; } +#ifdef CONFIG_PM_SLEEP static int xo15_sci_resume(struct device *dev) { /* Enable all EC events */ @@ -207,6 +208,7 @@ static int xo15_sci_resume(struct device *dev) return 0; } +#endif static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume); |