Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88d998c2 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'misc' into release

parents 79491ca4 d08ca2ca

arch/ia64/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args) 
		return 1;



ss_probe:

#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM)

#if !defined(CONFIG_PREEMPT) || defined(CONFIG_FREEZER)

	if (p->ainsn.inst_flag == INST_FLAG_BOOSTABLE && !p->post_handler) {

		/* Boost up -- we can execute copied instructions directly */

		ia64_psr(regs)->ri = p->ainsn.slot;

arch/x86/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, 
static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,

				       struct kprobe_ctlblk *kcb)

{

#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM)

#if !defined(CONFIG_PREEMPT) || defined(CONFIG_FREEZER)

	if (p->ainsn.boostable == 1 && !p->post_handler) {

		/* Boost up -- we can execute copied instructions directly */

		reset_current_kprobe();

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ obj-y += osl.o utils.o reboot.o\ 


# sleep related files

obj-y				+= wakeup.o

obj-y				+= main.o

obj-y				+= sleep.o

obj-$(CONFIG_ACPI_SLEEP)	+= proc.o

drivers/acpi/main.c→drivers/acpi/sleep.c

+0 −0

File moved.

View file

drivers/misc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o 
obj-$(CONFIG_ICS932S401)	+= ics932s401.o

obj-$(CONFIG_LKDTM)		+= lkdtm.o

obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o

obj-$(CONFIG_DELL_LAPTOP)	+= dell-laptop.o

obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o

obj-$(CONFIG_PHANTOM)		+= phantom.o

obj-$(CONFIG_SGI_IOC4)		+= ioc4.o