Fix Compile Errors

Conflicts:
	Makefile
	arch/arm/include/asm/assembler.h

	modified:   Makefile
	modified:   arch/arm/include/asm/assembler.h
	modified:   mm/vmscan.c