Merge branch 'akpm' (patches from Andrew)

	keepinitrd	[HW,ARM]

	kernelcore=	[KNL,X86,IA-64,PPC]

			Format: nn[KMGTPE] | "mirror"

			This parameter

			specifies the amount of memory usable by the kernel

			for non-movable allocations.  The requested amount is

			spread evenly throughout all nodes in the system. The

			remaining memory in each node is used for Movable

			pages. In the event, a node is too small to have both

			kernelcore and Movable pages, kernelcore pages will

			take priority and other nodes will have a larger number

			of Movable pages.  The Movable zone is used for the

			allocation of pages that may be reclaimed or moved

			by the page migration subsystem.  This means that

			HugeTLB pages may not be allocated from this zone.

			Note that allocations like PTEs-from-HighMem still

			use the HighMem zone if it exists, and the Normal

			Format: nn[KMGTPE] | nn% | "mirror"

			This parameter specifies the amount of memory usable by

			the kernel for non-movable allocations.  The requested

			amount is spread evenly throughout all nodes in the

			system as ZONE_NORMAL.  The remaining memory is used for

			movable memory in its own zone, ZONE_MOVABLE.  In the

			event, a node is too small to have both ZONE_NORMAL and

			ZONE_MOVABLE, kernelcore memory will take priority and

			other nodes will have a larger ZONE_MOVABLE.

			ZONE_MOVABLE is used for the allocation of pages that

			may be reclaimed or moved by the page migration

			subsystem.  Note that allocations like PTEs-from-HighMem

			still use the HighMem zone if it exists, and the Normal

			zone if it does not.

			Instead of specifying the amount of memory (nn[KMGTPE]),

			you can specify "mirror" option. In case "mirror"

			It is possible to specify the exact amount of memory in

			the form of "nn[KMGTPE]", a percentage of total system

			memory in the form of "nn%", or "mirror".  If "mirror"

			option is specified, mirrored (reliable) memory is used

			for non-movable allocations and remaining memory is used

			for Movable pages. nn[KMGTPE] and "mirror" are exclusive,

			so you can NOT specify nn[KMGTPE] and "mirror" at the same

			time.

			for Movable pages.  "nn[KMGTPE]", "nn%", and "mirror"

			are exclusive, so you cannot specify multiple forms.

	kgdbdbgp=	[KGDB,HW] kgdb over EHCI usb debug port.

			Format: <Controller#>[,poll interval]

	mousedev.yres=	[MOUSE] Vertical screen resolution, used for devices

			reporting absolute coordinates, such as tablets

	movablecore=nn[KMG]	[KNL,X86,IA-64,PPC] This parameter

			is similar to kernelcore except it specifies the

			amount of memory used for migratable allocations.

			If both kernelcore and movablecore is specified,

			then kernelcore will be at *least* the specified

			value but may be more. If movablecore on its own

			is specified, the administrator must be careful

	movablecore=	[KNL,X86,IA-64,PPC]

			Format: nn[KMGTPE] | nn%

			This parameter is the complement to kernelcore=, it

			specifies the amount of memory used for migratable

			allocations.  If both kernelcore and movablecore is

			specified, then kernelcore will be at *least* the

			specified value but may be more.  If movablecore on its

			own is specified, the administrator must be careful

			that the amount of memory usable for all allocations

			is not too small.

my $regex_direct_end_default = 'nr_reclaimed=([0-9]*)';

my $regex_kswapd_wake_default = 'nid=([0-9]*) order=([0-9]*)';

my $regex_kswapd_sleep_default = 'nid=([0-9]*)';

my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*)';

my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*) gfp_flags=([A-Z_|]*)';

my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) classzone_idx=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_skipped=([0-9]*) nr_taken=([0-9]*) lru=([a-z_]*)';

my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) nr_dirty=([0-9]*) nr_writeback=([0-9]*) nr_congested=([0-9]*) nr_immediate=([0-9]*) nr_activate=([0-9]*) nr_ref_keep=([0-9]*) nr_unmap_fail=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)';

my $regex_lru_shrink_active_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_rotated=([0-9]*) priority=([0-9]*)';

$regex_wakeup_kswapd = generate_traceevent_regex(

			"vmscan/mm_vmscan_wakeup_kswapd",

			$regex_wakeup_kswapd_default,

			"nid", "zid", "order");

			"nid", "zid", "order", "gfp_flags");

$regex_lru_isolate = generate_traceevent_regex(

			"vmscan/mm_vmscan_lru_isolate",

			$regex_lru_isolate_default,

	}

	/* don't handle anon pages here */

	mapping = page_mapping(page);

	mapping = page_mapping_file(page);

	if (!mapping)

		return;

	error("Attempting division by 0!");

}

unsigned long __stack_chk_guard;

void __stack_chk_guard_setup(void)

{

	__stack_chk_guard = 0x000a0dff;

}

const unsigned long __stack_chk_guard = 0x000a0dff;

void __stack_chk_fail(void)

{

{

	int ret;

	__stack_chk_guard_setup();

	output_data		= (unsigned char *)output_start;

	free_mem_ptr		= free_mem_ptr_p;

	free_mem_end_ptr	= free_mem_ptr_end_p;

	void *kto = kmap_atomic(to);

	if (!test_and_set_bit(PG_dcache_clean, &from->flags))

		__flush_dcache_page(page_mapping(from), from);

		__flush_dcache_page(page_mapping_file(from), from);

	raw_spin_lock(&minicache_lock);