Commit b7e14164 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "A lot of stuff, sorry about that. A week on a beach, then a bunch of
  time catching up then more time letting it bake in -next. Shan't do
  that again!"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (51 commits)
  include/linux/fs.h: fix comment about struct address_space
  checkpatch: fix ignoring cover-letter logic
  m32r: fix build failure
  lib/ratelimit.c: use deferred printk() version
  kernel/params.c: improve STANDARD_PARAM_DEF readability
  kernel/params.c: fix an overflow in param_attr_show
  kernel/params.c: fix the maximum length in param_get_string
  mm/memory_hotplug: define find_{smallest|biggest}_section_pfn as unsigned long
  mm/memory_hotplug: change pfn_to_section_nr/section_nr_to_pfn macro to inline function
  kernel/kcmp.c: drop branch leftover typo
  memremap: add scheduling point to devm_memremap_pages
  mm, page_alloc: add scheduling point to memmap_init_zone
  mm, memory_hotplug: add scheduling point to __add_pages
  lib/idr.c: fix comment for idr_replace()
  mm: memcontrol: use vmalloc fallback for large kmem memcg arrays
  kernel/sysctl.c: remove duplicate UINT_MAX check on do_proc_douintvec_conv()
  include/linux/bitfield.h: remove 32bit from FIELD_GET comment block
  lib/lz4: make arrays static const, reduces object code size
  exec: binfmt_misc: kill the onstack iname[BINPRM_BUF_SIZE] array
  exec: binfmt_misc: fix race between load_misc_binary() and kill_node()
  ...
parents 6c795b30 32e57c29

arch/alpha/include/asm/mmu_context.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/mm_types.h>

#include <linux/sched.h>



#include <asm/machvec.h>

#include <asm/compiler.h>

arch/m32r/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -194,6 +194,10 @@ config TIMER_DIVIDE 
	int "Timer divider (integer)"

	default "128"



config CPU_BIG_ENDIAN

        bool "Generate big endian code"

	default n



config CPU_LITTLE_ENDIAN

        bool "Generate little endian code"

	default n

arch/m32r/kernel/traps.c

+9 −0
Original line number Diff line number Diff line
@@ -114,6 +114,15 @@ static void set_eit_vector_entries(void) 
	_flush_cache_copyback_all();

}



void abort(void)

{

	BUG();



	/* if that doesn't kill us, halt */

	panic("Oops failed to kill thread");

}

EXPORT_SYMBOL(abort);



void __init trap_init(void)

{

	set_eit_vector_entries();

arch/powerpc/sysdev/fsl_rio.c

+15 −2
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ 
#define RIWAR_WRTYP_ALLOC	0x00006000

#define RIWAR_SIZE_MASK		0x0000003F



static DEFINE_SPINLOCK(fsl_rio_config_lock);



#define __fsl_read_rio_config(x, addr, err, op)		\

	__asm__ __volatile__(				\

		"1:	"op" %1,0(%2)\n"		\
@@ -184,6 +186,7 @@ fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid, 
			u8 hopcount, u32 offset, int len, u32 *val)

{

	struct rio_priv *priv = mport->priv;

	unsigned long flags;

	u8 *data;

	u32 rval, err = 0;
@@ -197,6 +200,8 @@ fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid, 
	if (offset > (0x1000000 - len) || !IS_ALIGNED(offset, len))

		return -EINVAL;



	spin_lock_irqsave(&fsl_rio_config_lock, flags);



	out_be32(&priv->maint_atmu_regs->rowtar,

		 (destid << 22) | (hopcount << 12) | (offset >> 12));

	out_be32(&priv->maint_atmu_regs->rowtear, (destid >> 10));
@@ -213,6 +218,7 @@ fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid, 
		__fsl_read_rio_config(rval, data, err, "lwz");

		break;

	default:

		spin_unlock_irqrestore(&fsl_rio_config_lock, flags);

		return -EINVAL;

	}
@@ -221,6 +227,7 @@ fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid, 
			 err, destid, hopcount, offset);

	}



	spin_unlock_irqrestore(&fsl_rio_config_lock, flags);

	*val = rval;



	return err;
@@ -244,7 +251,10 @@ fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid, 
			u8 hopcount, u32 offset, int len, u32 val)

{

	struct rio_priv *priv = mport->priv;

	unsigned long flags;

	u8 *data;

	int ret = 0;



	pr_debug

		("fsl_rio_config_write:"

		" index %d destid %d hopcount %d offset %8.8x len %d val %8.8x\n",
@@ -255,6 +265,8 @@ fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid, 
	if (offset > (0x1000000 - len) || !IS_ALIGNED(offset, len))

		return -EINVAL;



	spin_lock_irqsave(&fsl_rio_config_lock, flags);



	out_be32(&priv->maint_atmu_regs->rowtar,

		 (destid << 22) | (hopcount << 12) | (offset >> 12));

	out_be32(&priv->maint_atmu_regs->rowtear, (destid >> 10));
@@ -271,10 +283,11 @@ fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid, 
		out_be32((u32 *) data, val);

		break;

	default:

		return -EINVAL;

		ret = -EINVAL;

	}

	spin_unlock_irqrestore(&fsl_rio_config_lock, flags);



	return 0;

	return ret;

}



static void fsl_rio_inbound_mem_init(struct rio_priv *priv)

arch/powerpc/sysdev/fsl_rmu.c

+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ 


#define DOORBELL_MESSAGE_SIZE	0x08



static DEFINE_SPINLOCK(fsl_rio_doorbell_lock);



struct rio_msg_regs {

	u32 omr;

	u32 osr;
@@ -626,9 +628,13 @@ err_out: 
int fsl_rio_doorbell_send(struct rio_mport *mport,

				int index, u16 destid, u16 data)

{

	unsigned long flags;



	pr_debug("fsl_doorbell_send: index %d destid %4.4x data %4.4x\n",

		 index, destid, data);



	spin_lock_irqsave(&fsl_rio_doorbell_lock, flags);



	/* In the serial version silicons, such as MPC8548, MPC8641,

	 * below operations is must be.

	 */
@@ -638,6 +644,8 @@ int fsl_rio_doorbell_send(struct rio_mport *mport, 
	out_be32(&dbell->dbell_regs->oddatr, (index << 20) | data);

	out_be32(&dbell->dbell_regs->odmr, 0x00000001);



	spin_unlock_irqrestore(&fsl_rio_doorbell_lock, flags);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE