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

Commit 05cd2544 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 27f680ad a0601c89

Documentation/scheduler/sched-design-CFS.txt

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ other HZ detail. Thus the CFS scheduler has no notion of "timeslices" in the 
way the previous scheduler had, and has no heuristics whatsoever.  There is

only one central tunable (you have to switch on CONFIG_SCHED_DEBUG):



   /proc/sys/kernel/sched_granularity_ns

   /proc/sys/kernel/sched_min_granularity_ns



which can be used to tune the scheduler from "desktop" (i.e., low latencies) to

"server" (i.e., good batching) workloads.  It defaults to a setting suitable

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ KBUILD_CFLAGS += -g 
KBUILD_AFLAGS	+= -gdwarf-2

endif



ifdef CONFIG_FTRACE

ifdef CONFIG_FUNCTION_TRACER

KBUILD_CFLAGS	+= -pg

endif

arch/arm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ config ARM 
	select HAVE_ARCH_KGDB

	select HAVE_KPROBES if (!XIP_KERNEL)

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_FTRACE if (!XIP_KERNEL)

	select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)

	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)

	select HAVE_GENERIC_DMA_COHERENT

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ 
targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \

		 head.o misc.o $(OBJS)



ifeq ($(CONFIG_FTRACE),y)

ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif

arch/arm/common/sharpsl_pm.c

+14 −5
Original line number Diff line number Diff line
@@ -54,11 +54,13 @@ 
/*

 * Prototypes

 */

#ifdef CONFIG_PM

static int sharpsl_off_charge_battery(void);

static int sharpsl_check_battery_temp(void);

static int sharpsl_check_battery_voltage(void);

static int sharpsl_ac_check(void);

static int sharpsl_fatal_check(void);

#endif

static int sharpsl_check_battery_temp(void);

static int sharpsl_ac_check(void);

static int sharpsl_average_value(int ad);

static void sharpsl_average_clear(void);

static void sharpsl_charge_toggle(struct work_struct *private_);
@@ -424,6 +426,7 @@ static int sharpsl_check_battery_temp(void) 
	return 0;

}



#ifdef CONFIG_PM

static int sharpsl_check_battery_voltage(void)

{

	int val, i, buff[5];
@@ -455,6 +458,7 @@ static int sharpsl_check_battery_voltage(void) 


	return 0;

}

#endif



static int sharpsl_ac_check(void)

{
@@ -586,8 +590,6 @@ static int corgi_pxa_pm_enter(suspend_state_t state) 


	return 0;

}

#endif





/*

 * Check for fatal battery errors
@@ -738,7 +740,10 @@ static int sharpsl_off_charge_battery(void) 
		}

	}

}



#else

#define sharpsl_pm_suspend	NULL

#define sharpsl_pm_resume	NULL

#endif



static ssize_t battery_percentage_show(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -768,10 +773,12 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) 
	info->battery_life = sharpsl_pm.battstat.mainbat_percent;

}



#ifdef CONFIG_PM

static struct platform_suspend_ops sharpsl_pm_ops = {

	.enter		= corgi_pxa_pm_enter,

	.valid		= suspend_valid_only_mem,

};

#endif



static int __init sharpsl_pm_probe(struct platform_device *pdev)

{
@@ -802,7 +809,9 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) 


	apm_get_power_status = sharpsl_apm_get_power_status;



#ifdef CONFIG_PM

	suspend_set_ops(&sharpsl_pm_ops);

#endif



	mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));