Commit 8712a005 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge misc fixes from Andrew Morton:
 "Nine fixes"

* emailed patches from Andrew Morton akpm@linux-foundation.org>:
  cris: convert ffs from an object-like macro to a function-like macro
  hfsplus: add HFSX subfolder count support
  tools/testing/selftests/ipc/msgque.c: handle msgget failure return correctly
  MAINTAINERS: blackfin: add git repository
  revert "kallsyms: fix absolute addresses for kASLR"
  mm/Kconfig: fix URL for zsmalloc benchmark
  fs/proc/base.c: fix GPF in /proc/$PID/map_files
  mm/compaction: break out of loop on !PageBuddy in isolate_freepages_block
  mm: fix GFP_THISNODE callers and clarify
parents e6a4b6f5 0eb808eb

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1738,6 +1738,7 @@ F: include/uapi/linux/bfs_fs.h 
BLACKFIN ARCHITECTURE

M:	Steven Miao <realmz6@gmail.com>

L:	adi-buildroot-devel@lists.sourceforge.net

T:	git git://git.code.sf.net/p/adi-linux/code

W:	http://blackfin.uclinux.org

S:	Supported

F:	arch/blackfin/

arch/cris/include/asm/bitops.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) 
 * definition, which doesn't have the same semantics.  We don't want to

 * use -fno-builtin, so just hide the name ffs.

 */

#define ffs kernel_ffs

#define ffs(x) kernel_ffs(x)



#include <asm-generic/bitops/fls.h>

#include <asm-generic/bitops/__fls.h>

arch/ia64/kernel/uncached.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid) 
	/* attempt to allocate a granule's worth of cached memory pages */



	page = alloc_pages_exact_node(nid,

				GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,

				GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE,

				IA64_GRANULE_SHIFT-PAGE_SHIFT);

	if (!page) {

		mutex_unlock(&uc_pool->add_chunk_mutex);

arch/powerpc/platforms/cell/ras.c

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ static int __init cbe_ptcal_enable_on_node(int nid, int order) 


	area->nid = nid;

	area->order = order;

	area->pages = alloc_pages_exact_node(area->nid, GFP_KERNEL|GFP_THISNODE,

	area->pages = alloc_pages_exact_node(area->nid,

						GFP_KERNEL|__GFP_THISNODE,

						area->order);



	if (!area->pages) {

drivers/misc/sgi-xp/xpc_uv.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, 


	nid = cpu_to_node(cpu);

	page = alloc_pages_exact_node(nid,

				      GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,

				      GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE,

				      pg_order);

	if (page == NULL) {

		dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d "

CRA Git | Maintained and supported by SUSTech CRA and CCSE