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

Commit 3296944e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge mix fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (12 commits)
  drivers/rtc/rtc-pl031.c: fix the missing operation on enable
  drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler
  samples/seccomp: be less stupid about cross compiling
  checkpatch: fix $Float creation of match variables
  memcg: fix typo in kmemcg cache walk macro
  mm: fix wrong comments about anon_vma lock
  MAINTAINERS: update avr32 web ressources
  mm/hugetlb: set PTE as huge in hugetlb_change_protection and remove_migration_pte
  drivers/rtc/rtc-vt8500.c: fix year field in vt8500_rtc_set_time()
  tools/vm: add .gitignore to ignore built binaries
  thp: avoid dumping huge zero page
  nilfs2: fix fix very long mount time issue
parents 3f4e5aac e7e034e1

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ AVR32 ARCHITECTURE 
M:	Haavard Skinnemoen <hskinnemoen@gmail.com>

M:	Hans-Christian Egtvedt <egtvedt@samfundet.no>

W:	http://www.atmel.com/products/AVR32/

W:	http://avr32linux.org/

W:	http://mirror.egtvedt.no/avr32linux.org/

W:	http://avrfreaks.net/

S:	Maintained

F:	arch/avr32/

drivers/rtc/rtc-isl1208.c

+3 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ isl1208_rtc_interrupt(int irq, void *data) 
{

	unsigned long timeout = jiffies + msecs_to_jiffies(1000);

	struct i2c_client *client = data;

	struct rtc_device *rtc = i2c_get_clientdata(client);

	int handled = 0, sr, err;



	/*
@@ -528,6 +529,8 @@ isl1208_rtc_interrupt(int irq, void *data) 
	if (sr & ISL1208_REG_SR_ALM) {

		dev_dbg(&client->dev, "alarm!\n");



		rtc_update_irq(rtc, 1, RTC_IRQF | RTC_AF);



		/* Clear the alarm */

		sr &= ~ISL1208_REG_SR_ALM;

		sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR, sr);

drivers/rtc/rtc-pl031.c

+5 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define RTC_YMR		0x34	/* Year match register */

#define RTC_YLR		0x38	/* Year data load register */



#define RTC_CR_EN	(1 << 0)	/* counter enable bit */

#define RTC_CR_CWEN	(1 << 26)	/* Clockwatch enable bit */



#define RTC_TCR_EN	(1 << 1) /* Periodic timer enable bit */
@@ -320,7 +321,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) 
	struct pl031_local *ldata;

	struct pl031_vendor_data *vendor = id->data;

	struct rtc_class_ops *ops = &vendor->ops;

	unsigned long time;

	unsigned long time, data;



	ret = amba_request_regions(adev, NULL);

	if (ret)
@@ -345,10 +346,11 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) 
	dev_dbg(&adev->dev, "designer ID = 0x%02x\n", amba_manf(adev));

	dev_dbg(&adev->dev, "revision = 0x%01x\n", amba_rev(adev));



	data = readl(ldata->base + RTC_CR);

	/* Enable the clockwatch on ST Variants */

	if (vendor->clockwatch)

		writel(readl(ldata->base + RTC_CR) | RTC_CR_CWEN,

		       ldata->base + RTC_CR);

		data |= RTC_CR_CWEN;

	writel(data | RTC_CR_EN, ldata->base + RTC_CR);



	/*

	 * On ST PL031 variants, the RTC reset value does not provide correct

drivers/rtc/rtc-vt8500.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int vt8500_rtc_set_time(struct device *dev, struct rtc_time *tm) 
		return -EINVAL;

	}



	writel((bin2bcd(tm->tm_year - 100) << DATE_YEAR_S)

	writel((bin2bcd(tm->tm_year % 100) << DATE_YEAR_S)

		| (bin2bcd(tm->tm_mon + 1) << DATE_MONTH_S)

		| (bin2bcd(tm->tm_mday))

		| ((tm->tm_year >= 200) << DATE_CENTURY_S),

fs/nilfs2/ioctl.c

+4 −1
Original line number Diff line number Diff line
@@ -664,8 +664,11 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, 
	if (ret < 0)

		printk(KERN_ERR "NILFS: GC failed during preparation: "

			"cannot read source blocks: err=%d\n", ret);

	else

	else {

		if (nilfs_sb_need_update(nilfs))

			set_nilfs_discontinued(nilfs);

		ret = nilfs_clean_segments(inode->i_sb, argv, kbufs);

	}



	nilfs_remove_all_gcinodes(nilfs);

	clear_nilfs_gc_running(nilfs);