Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (7da6cd8b) · Commits · e / devices / android_kernel_fairphone_FP4

arch/sparc/mm/init.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -206,6 +206,7 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
	#ifdef CONFIG_BLK_DEV_INITRD		#ifdef CONFIG_BLK_DEV_INITRD
	/* Now have to check initial ramdisk, so that bootmap does not overwrite it */		/* Now have to check initial ramdisk, so that bootmap does not overwrite it */
	if (sparc_ramdisk_image) {		if (sparc_ramdisk_image) {
			if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)
	sparc_ramdisk_image -= KERNBASE;		sparc_ramdisk_image -= KERNBASE;
	initrd_start = sparc_ramdisk_image + phys_base;		initrd_start = sparc_ramdisk_image + phys_base;
	initrd_end = initrd_start + sparc_ramdisk_size;		initrd_end = initrd_start + sparc_ramdisk_size;

include/asm-sparc64/percpu.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,8 @@

	#include <linux/compiler.h>		#include <linux/compiler.h>

			register unsigned long __local_per_cpu_offset asm("g5");

	#ifdef CONFIG_SMP		#ifdef CONFIG_SMP

	#define setup_per_cpu_areas() do { } while (0)		#define setup_per_cpu_areas() do { } while (0)
	@@ -23,8 +25,6 @@ extern unsigned long __per_cpu_shift;
	__typeof__(type) per_cpu__##name \		__typeof__(type) per_cpu__##name \
	____cacheline_aligned_in_smp		____cacheline_aligned_in_smp

	register unsigned long __local_per_cpu_offset asm("g5");

	/* var is in discarded region: offset to particular copy we want */		/* var is in discarded region: offset to particular copy we want */
	#define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)))		#define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)))
	#define __get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __local_per_cpu_offset))		#define __get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __local_per_cpu_offset))

include/asm-sparc64/system.h

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -141,7 +141,6 @@ do { \
	* not preserve it's value. Hairy, but it lets us remove 2 loads		* not preserve it's value. Hairy, but it lets us remove 2 loads
	* and 2 stores in this critical code path. -DaveM		* and 2 stores in this critical code path. -DaveM
	*/		*/
	#define EXTRA_CLOBBER ,"%l1"
	#define switch_to(prev, next, last) \		#define switch_to(prev, next, last) \
	do { if (test_thread_flag(TIF_PERFCTR)) { \		do { if (test_thread_flag(TIF_PERFCTR)) { \
	unsigned long __tmp; \		unsigned long __tmp; \
	@@ -164,33 +163,34 @@ do { if (test_thread_flag(TIF_PERFCTR)) { \
	"stx %%i6, [%%sp + 2047 + 0x70]\n\t" \		"stx %%i6, [%%sp + 2047 + 0x70]\n\t" \
	"stx %%i7, [%%sp + 2047 + 0x78]\n\t" \		"stx %%i7, [%%sp + 2047 + 0x78]\n\t" \
	"rdpr %%wstate, %%o5\n\t" \		"rdpr %%wstate, %%o5\n\t" \
	"stx %%o6, [%%g6 + %3]\n\t" \		"stx %%o6, [%%g6 + %6]\n\t" \
	"stb %%o5, [%%g6 + %2]\n\t" \
	"rdpr %%cwp, %%o5\n\t" \
	"stb %%o5, [%%g6 + %5]\n\t" \		"stb %%o5, [%%g6 + %5]\n\t" \
	"mov %1, %%g6\n\t" \		"rdpr %%cwp, %%o5\n\t" \
	"ldub [%1 + %5], %%g1\n\t" \		"stb %%o5, [%%g6 + %8]\n\t" \
			"mov %4, %%g6\n\t" \
			"ldub [%4 + %8], %%g1\n\t" \
	"wrpr %%g1, %%cwp\n\t" \		"wrpr %%g1, %%cwp\n\t" \
	"ldx [%%g6 + %3], %%o6\n\t" \		"ldx [%%g6 + %6], %%o6\n\t" \
	"ldub [%%g6 + %2], %%o5\n\t" \		"ldub [%%g6 + %5], %%o5\n\t" \
	"ldub [%%g6 + %4], %%o7\n\t" \		"ldub [%%g6 + %7], %%o7\n\t" \
	"wrpr %%o5, 0x0, %%wstate\n\t" \		"wrpr %%o5, 0x0, %%wstate\n\t" \
	"ldx [%%sp + 2047 + 0x70], %%i6\n\t" \		"ldx [%%sp + 2047 + 0x70], %%i6\n\t" \
	"ldx [%%sp + 2047 + 0x78], %%i7\n\t" \		"ldx [%%sp + 2047 + 0x78], %%i7\n\t" \
	"ldx [%%g6 + %6], %%g4\n\t" \		"ldx [%%g6 + %9], %%g4\n\t" \
	"brz,pt %%o7, 1f\n\t" \		"brz,pt %%o7, 1f\n\t" \
	" mov %%g7, %0\n\t" \		" mov %%g7, %0\n\t" \
	"b,a ret_from_syscall\n\t" \		"b,a ret_from_syscall\n\t" \
	"1:\n\t" \		"1:\n\t" \
	: "=&r" (last) \		: "=&r" (last), "=r" (current), "=r" (current_thread_info_reg), \
			"=r" (__local_per_cpu_offset) \
	: "0" (task_thread_info(next)), \		: "0" (task_thread_info(next)), \
	"i" (TI_WSTATE), "i" (TI_KSP), "i" (TI_NEW_CHILD), \		"i" (TI_WSTATE), "i" (TI_KSP), "i" (TI_NEW_CHILD), \
	"i" (TI_CWP), "i" (TI_TASK) \		"i" (TI_CWP), "i" (TI_TASK) \
	: "cc", \		: "cc", \
	"g1", "g2", "g3", "g7", \		"g1", "g2", "g3", "g7", \
	"l2", "l3", "l4", "l5", "l6", "l7", \		"l1", "l2", "l3", "l4", "l5", "l6", "l7", \
	"i0", "i1", "i2", "i3", "i4", "i5", \		"i0", "i1", "i2", "i3", "i4", "i5", \
	"o0", "o1", "o2", "o3", "o4", "o5", "o7" EXTRA_CLOBBER);\		"o0", "o1", "o2", "o3", "o4", "o5", "o7"); \
	/* If you fuck with this, update ret_from_syscall code too. */ \		/* If you fuck with this, update ret_from_syscall code too. */ \
	if (test_thread_flag(TIF_PERFCTR)) { \		if (test_thread_flag(TIF_PERFCTR)) { \
	write_pcr(current_thread_info()->pcr_reg); \		write_pcr(current_thread_info()->pcr_reg); \