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

Commit 08077ca8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge fixes from Andrew Morton:
 "13 patches.  12 are fixes and one is a little preparatory thing for
  Andi."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (13 commits)
  memory hotplug: fix section info double registration bug
  mm/page_alloc: fix the page address of higher page's buddy calculation
  drivers/rtc/rtc-twl.c: ensure all interrupts are disabled during probe
  compiler.h: add __visible
  pid-namespace: limit value of ns_last_pid to (0, max_pid)
  include/net/sock.h: squelch compiler warning in sk_rmem_schedule()
  slub: consider pfmemalloc_match() in get_partial_node()
  slab: fix starting index for finding another object
  slab: do ClearSlabPfmemalloc() for all pages of slab
  nbd: clear waiting_queue on shutdown
  MAINTAINERS: fix TXT maintainer list and source repo path
  mm/ia64: fix a memory block size bug
  memory hotplug: reset pgdat->kswapd to NULL if creating kernel thread fails
parents 2ade0b7f f14851af

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -3666,11 +3666,12 @@ F: Documentation/networking/README.ipw2200 
F:	drivers/net/wireless/ipw2x00/



INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)

M:	Joseph Cihula <joseph.cihula@intel.com>

M:	Richard L Maliszewski <richard.l.maliszewski@intel.com>

M:	Gang Wei <gang.wei@intel.com>

M:	Shane Wang <shane.wang@intel.com>

L:	tboot-devel@lists.sourceforge.net

W:	http://tboot.sourceforge.net

T:	Mercurial http://www.bughost.org/repos.hg/tboot.hg

T:	hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot

S:	Supported

F:	Documentation/intel_txt.txt

F:	include/linux/tboot.h

drivers/block/nbd.c

+9 −0
Original line number Diff line number Diff line
@@ -449,6 +449,14 @@ static void nbd_clear_que(struct nbd_device *nbd) 
		req->errors++;

		nbd_end_request(req);

	}



	while (!list_empty(&nbd->waiting_queue)) {

		req = list_entry(nbd->waiting_queue.next, struct request,

				 queuelist);

		list_del_init(&req->queuelist);

		req->errors++;

		nbd_end_request(req);

	}

}
@@ -598,6 +606,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, 
		nbd->file = NULL;

		nbd_clear_que(nbd);

		BUG_ON(!list_empty(&nbd->queue_head));

		BUG_ON(!list_empty(&nbd->waiting_queue));

		if (file)

			fput(file);

		return 0;

drivers/rtc/rtc-twl.c

+5 −0
Original line number Diff line number Diff line
@@ -495,6 +495,11 @@ static int __devinit twl_rtc_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto out1;



	/* ensure interrupts are disabled, bootloaders can be strange */

	ret = twl_rtc_write_u8(0, REG_RTC_INTERRUPTS_REG);

	if (ret < 0)

		dev_warn(&pdev->dev, "unable to disable interrupt\n");



	/* init cached IRQ enable bits */

	ret = twl_rtc_read_u8(&rtc_irq_bits, REG_RTC_INTERRUPTS_REG);

	if (ret < 0)

include/linux/compiler-gcc4.h

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ 
#endif

#endif



#if __GNUC_MINOR__ >= 6

/*

 * Tell the optimizer that something else uses this function or variable.

 */

#define __visible __attribute__((externally_visible))

#endif



#if __GNUC_MINOR__ > 0

#define __compiletime_object_size(obj) __builtin_object_size(obj, 0)

#endif

include/linux/compiler.h

+4 −0
Original line number Diff line number Diff line
@@ -278,6 +278,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); 
# define __section(S) __attribute__ ((__section__(#S)))

#endif



#ifndef __visible

#define __visible

#endif



/* Are two types/vars the same type (ignoring qualifiers)? */

#ifndef __same_type

# define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))