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

Commit 87135d92 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.28-rc4' into x86/cleanups

parents 4fcc50ab f7160c75

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 28

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Killer Bat of Doom



# *DOCUMENTATION*

drivers/cpuidle/cpuidle.c

+3 −1
Original line number Diff line number Diff line
@@ -65,12 +65,14 @@ static void cpuidle_idle_call(void) 
		return;

	}



#if 0

	/* shows regressions, re-enable for 2.6.29 */

	/*

	 * run any timers that can be run now, at this point

	 * before calculating the idle duration etc.

	 */

	hrtimer_peek_ahead_timers();



#endif

	/* ask the governor for the next state */

	next_state = cpuidle_curr_governor->select(dev);

	if (need_resched())

drivers/mmc/core/bus.c

+1 −2
Original line number Diff line number Diff line
@@ -216,8 +216,7 @@ int mmc_add_card(struct mmc_card *card) 
	int ret;

	const char *type;



	snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),

		 "%s:%04x", mmc_hostname(card->host), card->rca);

	dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);



	switch (card->type) {

	case MMC_TYPE_MMC:

drivers/mmc/core/core.c

+5 −1
Original line number Diff line number Diff line
@@ -280,7 +280,11 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card) 
			(card->host->ios.clock / 1000);



		if (data->flags & MMC_DATA_WRITE)

			limit_us = 250000;

			/*

			 * The limit is really 250 ms, but that is

			 * insufficient for some crappy cards.

			 */

			limit_us = 300000;

		else

			limit_us = 100000;

drivers/mmc/core/host.c

+2 −3
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) 
	if (err)

		goto free;



	snprintf(host->class_dev.bus_id, BUS_ID_SIZE,

		 "mmc%d", host->index);

	dev_set_name(&host->class_dev, "mmc%d", host->index);



	host->parent = dev;

	host->class_dev.parent = dev;
@@ -121,7 +120,7 @@ int mmc_add_host(struct mmc_host *host) 
	WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) &&

		!host->ops->enable_sdio_irq);



	led_trigger_register_simple(host->class_dev.bus_id, &host->led);

	led_trigger_register_simple(dev_name(&host->class_dev), &host->led);



	err = device_add(&host->class_dev);

	if (err)