Commit 110a5c8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's patch-bomb) 

Merge fixes from Andrew Morton:
 "13 fixes.  The acerhdf patches aren't (really) fixes.  But they've
  been stuck in my tree for up to two years, sent to Matthew multiple
  times and the developers are unhappy."

* emailed from Andrew Morton <akpm@linux-foundation.org>: (13 patches)
  mm: fix NULL ptr dereference in move_pages
  mm: fix NULL ptr dereference in migrate_pages
  revert "proc: clear_refs: do not clear reserved pages"
  drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled
  arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
  hugetlbfs: lockdep annotate root inode properly
  acerhdf: lowered default temp fanon/fanoff values
  acerhdf: add support for new hardware
  acerhdf: add support for Aspire 1410 BIOS v1.3314
  fs/buffer.c: remove BUG() in possible but rare condition
  mm: fix up the vmscan stat in vmstat
  epoll: clear the tfile_check_list on -ELOOP
  mm/hugetlb: fix warning in alloc_huge_page/dequeue_huge_page_vma
parents 2300fd67 6e8b09ea

arch/arm/mach-ux500/mbox-db5500.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev, 
	return sprintf(buf, "0x%X\n", mbox_value);

	return sprintf(buf, "0x%X\n", mbox_value);

}

}





static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo);

static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo);





static int mbox_show(struct seq_file *s, void *data)

static int mbox_show(struct seq_file *s, void *data)

{

{

drivers/platform/x86/acerhdf.c

+45 −22
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ 
 */

 */

#undef START_IN_KERNEL_MODE

#undef START_IN_KERNEL_MODE





#define DRV_VER "0.5.24"

#define DRV_VER "0.5.26"





/*

/*

 * According to the Atom N270 datasheet,

 * According to the Atom N270 datasheet,
@@ -83,8 +83,8 @@ static int kernelmode; 
#endif

#endif





static unsigned int interval = 10;

static unsigned int interval = 10;

static unsigned int fanon = 63000;

static unsigned int fanon = 60000;

static unsigned int fanoff = 58000;

static unsigned int fanoff = 53000;

static unsigned int verbose;

static unsigned int verbose;

static unsigned int fanstate = ACERHDF_FAN_AUTO;

static unsigned int fanstate = ACERHDF_FAN_AUTO;

static char force_bios[16];

static char force_bios[16];
@@ -150,6 +150,8 @@ static const struct bios_settings_t bios_tbl[] = { 
	{"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00} },

	/* LT1005u */

	{"Acer", "LT-10Q", "v0.3310", 0x55, 0x58, {0x20, 0x00} },

	/* Acer 1410 */

	/* Acer 1410 */

	{"Acer", "Aspire 1410", "v0.3108", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v0.3108", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v0.3113", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v0.3113", 0x55, 0x58, {0x9e, 0x00} },
@@ -161,6 +163,7 @@ static const struct bios_settings_t bios_tbl[] = { 
	{"Acer", "Aspire 1410", "v1.3303", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v1.3303", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v1.3308", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v1.3308", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },

	/* Acer 1810xx */

	/* Acer 1810xx */

	{"Acer", "Aspire 1810TZ", "v0.3108", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v0.3108", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v0.3108", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v0.3108", 0x55, 0x58, {0x9e, 0x00} },
@@ -183,19 +186,32 @@ static const struct bios_settings_t bios_tbl[] = { 
	{"Acer", "Aspire 1810TZ", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v1.3310", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v1.3310", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v1.3314", 0x55, 0x58, {0x9e, 0x00} },

	/* Acer 531 */

	/* Acer 531 */

	{"Acer", "AO531h", "v0.3104", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AO531h", "v0.3201", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AO531h", "v0.3201", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AO531h", "v0.3304", 0x55, 0x58, {0x20, 0x00} },

	/* Acer 751 */

	{"Acer", "AO751h", "V0.3212", 0x55, 0x58, {0x21, 0x00} },

	/* Acer 1825 */

	{"Acer", "Aspire 1825PTZ", "V1.3118", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1825PTZ", "V1.3127", 0x55, 0x58, {0x9e, 0x00} },

	/* Acer TravelMate 7730 */

	{"Acer", "TravelMate 7730G", "v0.3509", 0x55, 0x58, {0xaf, 0x00} },

	/* Gateway */

	/* Gateway */

	{"Gateway", "AOA110", "v0.3103",  0x55, 0x58, {0x21, 0x00} },

	{"Gateway", "AOA110", "v0.3103",  0x55, 0x58, {0x21, 0x00} },

	{"Gateway", "AOA150", "v0.3103",  0x55, 0x58, {0x20, 0x00} },

	{"Gateway", "AOA150", "v0.3103",  0x55, 0x58, {0x20, 0x00} },

	{"Gateway", "LT31",   "v1.3103",  0x55, 0x58, {0x9e, 0x00} },

	{"Gateway", "LT31",   "v1.3103",  0x55, 0x58, {0x9e, 0x00} },

	{"Gateway", "LT31",   "v1.3201",  0x55, 0x58, {0x9e, 0x00} },

	{"Gateway", "LT31",   "v1.3201",  0x55, 0x58, {0x9e, 0x00} },

	{"Gateway", "LT31",   "v1.3302",  0x55, 0x58, {0x9e, 0x00} },

	{"Gateway", "LT31",   "v1.3302",  0x55, 0x58, {0x9e, 0x00} },

	{"Gateway", "LT31",   "v1.3303t", 0x55, 0x58, {0x9e, 0x00} },

	/* Packard Bell */

	/* Packard Bell */

	{"Packard Bell", "DOA150",  "v0.3104",  0x55, 0x58, {0x21, 0x00} },

	{"Packard Bell", "DOA150",  "v0.3104",  0x55, 0x58, {0x21, 0x00} },

	{"Packard Bell", "DOA150",  "v0.3105",  0x55, 0x58, {0x20, 0x00} },

	{"Packard Bell", "DOA150",  "v0.3105",  0x55, 0x58, {0x20, 0x00} },

	{"Packard Bell", "AOA110",  "v0.3105",  0x55, 0x58, {0x21, 0x00} },

	{"Packard Bell", "AOA110",  "v0.3105",  0x55, 0x58, {0x21, 0x00} },

	{"Packard Bell", "AOA150",  "v0.3105",  0x55, 0x58, {0x20, 0x00} },

	{"Packard Bell", "AOA150",  "v0.3105",  0x55, 0x58, {0x20, 0x00} },

	{"Packard Bell", "ENBFT",   "V1.3118",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "ENBFT",   "V1.3127",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMU",   "v1.3303",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMU",   "v1.3303",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMU",   "v0.3120",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMU",   "v0.3120",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMU",   "v0.3108",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMU",   "v0.3108",  0x55, 0x58, {0x9e, 0x00} },
@@ -206,6 +222,8 @@ static const struct bios_settings_t bios_tbl[] = { 
	{"Packard Bell", "DOTMU",   "v1.3204",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMU",   "v1.3204",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMA",   "v1.3201",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMA",   "v1.3201",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMA",   "v1.3302",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMA",   "v1.3302",  0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMA",   "v1.3303t", 0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTVR46", "v1.3308",  0x55, 0x58, {0x9e, 0x00} },

	/* pewpew-terminator */

	/* pewpew-terminator */

	{"", "", "", 0, 0, {0, 0} }

	{"", "", "", 0, 0, {0, 0} }

};

};
@@ -701,15 +719,20 @@ MODULE_LICENSE("GPL"); 
MODULE_AUTHOR("Peter Feuerer");

MODULE_AUTHOR("Peter Feuerer");

MODULE_DESCRIPTION("Aspire One temperature and fan driver");

MODULE_DESCRIPTION("Aspire One temperature and fan driver");

MODULE_ALIAS("dmi:*:*Acer*:pnAOA*:");

MODULE_ALIAS("dmi:*:*Acer*:pnAOA*:");

MODULE_ALIAS("dmi:*:*Acer*:pnAO751h*:");

MODULE_ALIAS("dmi:*:*Acer*:pnAspire*1410*:");

MODULE_ALIAS("dmi:*:*Acer*:pnAspire*1410*:");

MODULE_ALIAS("dmi:*:*Acer*:pnAspire*1810*:");

MODULE_ALIAS("dmi:*:*Acer*:pnAspire*1810*:");

MODULE_ALIAS("dmi:*:*Acer*:pnAspire*1825PTZ:");

MODULE_ALIAS("dmi:*:*Acer*:pnAO531*:");

MODULE_ALIAS("dmi:*:*Acer*:pnAO531*:");

MODULE_ALIAS("dmi:*:*Acer*:TravelMate*7730G:");

MODULE_ALIAS("dmi:*:*Gateway*:pnAOA*:");

MODULE_ALIAS("dmi:*:*Gateway*:pnAOA*:");

MODULE_ALIAS("dmi:*:*Gateway*:pnLT31*:");

MODULE_ALIAS("dmi:*:*Gateway*:pnLT31*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnAOA*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnAOA*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOA*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOA*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOTMU*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOTMU*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnENBFT*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOTMA*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOTMA*:");

MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOTVR46*:");





module_init(acerhdf_init);

module_init(acerhdf_init);

module_exit(acerhdf_exit);
 
module_exit(acerhdf_exit);

drivers/rtc/rtc-ds1307.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -902,6 +902,7 @@ read_rtc: 
		}

		}

		ds1307->nvram->attr.name = "nvram";

		ds1307->nvram->attr.name = "nvram";

		ds1307->nvram->attr.mode = S_IRUGO | S_IWUSR;

		ds1307->nvram->attr.mode = S_IRUGO | S_IWUSR;

		sysfs_bin_attr_init(ds1307->nvram);

		ds1307->nvram->read = ds1307_nvram_read,

		ds1307->nvram->read = ds1307_nvram_read,

		ds1307->nvram->write = ds1307_nvram_write,

		ds1307->nvram->write = ds1307_nvram_write,

		ds1307->nvram->size = chip->nvram_size;

		ds1307->nvram->size = chip->nvram_size;

fs/buffer.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -985,7 +985,6 @@ grow_dev_page(struct block_device *bdev, sector_t block, 
	return page;

	return page;





failed:

failed:

	BUG();

	unlock_page(page);

	unlock_page(page);

	page_cache_release(page);

	page_cache_release(page);

	return NULL;

	return NULL;

fs/eventpoll.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1663,8 +1663,10 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, 
	if (op == EPOLL_CTL_ADD) {

	if (op == EPOLL_CTL_ADD) {

		if (is_file_epoll(tfile)) {

		if (is_file_epoll(tfile)) {

			error = -ELOOP;

			error = -ELOOP;

			if (ep_loop_check(ep, tfile) != 0)

			if (ep_loop_check(ep, tfile) != 0) {

				clear_tfile_check_list();

				goto error_tgt_fput;

				goto error_tgt_fput;

			}

		} else

		} else

			list_add(&tfile->f_tfile_llink, &tfile_check_list);

			list_add(&tfile->f_tfile_llink, &tfile_check_list);

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE